Skip to content
SecurityOn
Go back

Building the Storage and Productivity Baseline

In “Building a Clean Windows Baseline”, I replaced the original corporate master image with Windows 11 Pro, completed updates, and confirmed healthy device recognition.

Before installing development tools, I wanted to settle the daily working environment and the location of its data. That meant deciding what an OS reinstallation should replace, what it should preserve, and whether everyday file storage depended on a cloud service unavailable in the target workplace.

In this stage, I refined the original architecture’s storage plan around the workstation’s actual working and recovery requirements.

1. Moving beyond C:\OfflineLab\

The initial plan gathered installers and research assets around C:\OfflineLab\. That was a simple place to manage them, but keeping large models and datasets on the OS volume would increase the amount of data that needed attention during C: recovery.

I decided to separate the lifecycles of the OS and applications, user data, and research assets, and to give future local recovery material its own location. Windows, the user profile, and applications would remain on C:. Everyday files, research assets, and a future recovery image would live on D:.

AreaInitial designLocation chosen during this build
Offline-ready assetsCentred on C:\OfflineLab\D:\Lab\OfflineLab\
Models and datasetsGrouped inside OfflineLabD:\Lab\Models\, D:\Lab\Datasets\
Everyday user filesLocation not yet specifiedD:\UserData\
Recovery imageRecovery capability plannedD:\Recovery\GoldenResearch.wim reserved

This gives me a clearer basis for a future procedure that restores only C:, preserving research data on D: during OS reinstallation. It also lets large research assets and the recovery image share the available capacity on D:.

2. Device Encryption before Partitioning

BitLocker had not been active on the old master image. After the clean installation, however, I found that BitLocker / Device Encryption was unexpectedly enabled. I did not establish when or why it had been enabled.

The target on-site company does not require BitLocker. I also wanted to keep the planned recovery flow through internal WinRE and D:\Recovery\GoldenResearch.wim straightforward. For this workstation’s use case, I deliberately disabled BitLocker and waited for full decryption before changing the partitions.

The verified final state was:

BitLocker Version: None
Conversion Status: Fully Decrypted
Percentage Encrypted: 0.0%
Encryption Method: None
Protection Status: Protection Off
Key Protectors: None Found

I checked more than whether protection was off: the conversion status was Fully Decrypted and the encrypted percentage was 0.0%. That was the starting condition for the storage changes.

3. A 350GB C: Volume and D: Data

After confirming decryption, I shrank C: to 350GB and created D: from the remaining space. These were the three commands used to change the storage layout:

Resize-Partition -DriveLetter C -Size 350GB
New-Partition -DiskNumber 0 -UseMaximumSize -DriveLetter D
Format-Volume -DriveLetter D -FileSystem NTFS -NewFileSystemLabel "Data" -Confirm:$false

Disk 0 remained the Samsung 1TB NVMe SSD using GPT. All partitions were reported as healthy / OK after the work.

PartitionSizeFile system and purpose
EFI200MBSystem boot
MSR16MBMicrosoft Reserved
C:350GBNTFS; Windows and applications
D: Data602.78GBNTFS; user and research data, and a future recovery image
Recovery900MBRecovery partition created by the Windows installation

At the time of recording, C: had approximately 270.7GB free. D: was almost entirely free when created. These figures describe the baseline before further tools and research assets are added.

I retained the 900MB Recovery partition created by the Windows installation and did not create a separate large partition for the recovery image.

4. Three Roles for D:

The top level of D: separates UserData, Lab, and Recovery. Everyday files, research assets, and OS recovery material each have a defined location.

D:\
├─ UserData\
│  ├─ Desktop\
│  ├─ Documents\
│  ├─ Downloads\
│  ├─ Pictures\
│  ├─ Music\
│  └─ Videos\
├─ Lab\
│  ├─ Research\
│  ├─ Models\
│  ├─ Datasets\
│  ├─ OfflineLab\
│  │  ├─ installers\
│  │  ├─ wheelhouse\
│  │  ├─ vscode-extensions\
│  │  ├─ repos\
│  │  ├─ docs\
│  │  ├─ manifests\
│  │  └─ backups\
│  └─ WSL\
└─ Recovery\

Within Lab, research work, large models and datasets, and OfflineLab material for rebuilding the environment have separate locations. The WSL directory is also reserved for a later stage. Creating these directories does not mean that WSL2 is installed or that research assets have already been collected.

D:\Recovery\ is reserved for a future GoldenResearch.wim. The plan is to use the internal Windows Recovery Environment with the WIM on D:. Neither WIM creation nor recovery validation was completed in this phase.

Avoiding a large, fixed recovery partition leaves capacity available for the actual sizes of research data and the recovery image, rather than setting aside space that may remain unused.

C: and D: are still on the same physical SSD. This is a local rollback design for OS or software corruption; it does not protect against physical SSD failure. External HDD or USB storage is not practical in the target company environment, which is why I chose this local recovery arrangement.

5. Relocating Known Folders from OneDrive

After OOBE with a personal Microsoft account, I inspected the Known Folder paths in the registry. Desktop, Documents, and Pictures already pointed into OneDrive. Music, Videos, and Downloads remained under the local profile.

Known FolderObserved locationNew location
DesktopC:\Users\<user>\OneDrive\DesktopD:\UserData\Desktop
DocumentsC:\Users\<user>\OneDrive\DocumentsD:\UserData\Documents
DownloadsUnder the local profileD:\UserData\Downloads
PicturesC:\Users\<user>\OneDrive\PicturesD:\UserData\Pictures
MusicUnder the local profileD:\UserData\Music
VideosUnder the local profileD:\UserData\Videos

OneDrive is blocked in the target company environment, so it was not a useful dependency for everyday file management on this workstation. I moved all six Known Folders to D: and detached them from OneDrive before removing OneDrive itself.

The user profile and AppData remain on C:. Moving the entire profile would add unnecessary compatibility risk around the paths expected by Windows, Microsoft Store, and applications. Relocating the Known Folders was sufficient to separate the user files I wanted to preserve.

6. Selective Windows Cleanup

The aim was not aggressive debloating. I removed consumer and personal apps that were unnecessary for this baseline while retaining Windows, Store, hardware integration, runtime, and codec components.

The removed apps included:

I deliberately preserved:

An unfamiliar package name or a component I was not yet using was not enough reason to remove it. I kept the cleanup limited so that the foundations for later NPU, GPU, and application use remained available.

7. Productivity Tools and Browser Roles

The installations in this phase supported document work and research reading.

ToolRole in this baseline
Microsoft 365Document work through a school / student licence
7-ZipArchive management
ZoteroPapers and reference management
Firefox + Zotero ConnectorPreferred browser for personal research and collecting references
Google ChromeWeb compatibility checks and testing
EdgeRetained as the default browser

I prefer Firefox for personal research and installed the Zotero Connector there. Chrome remains mainly for checking web compatibility.

Edge remains the default because I expect corporate sites and security modules to be more likely to support Chromium / Edge reliably. This is the compatibility consideration behind the default, rather than a claim that all target corporate sites have already been tested.

8. Finding the Samsung Controls

Some settings needed more than the standard Windows interface. I installed and used Samsung Device Care, but it alone did not expose the battery and performance controls I needed. Samsung Settings was also difficult to find directly, so I used Galaxy Book Experience to find and install it.

Samsung Settings remained necessary for hardware-specific controls such as battery protection and performance mode. Removing every Samsung app would therefore have been unhelpful. My approach also allowed Samsung Update and related support apps to remain where useful.

Because the laptop will normally stay connected to AC power, I set Battery Protection to 60%. I used High Performance mode temporarily during the heavy installation and build work. Normal or optimised mode can be used for everyday work after setup.

This completed the configuration for the intended working conditions. It was not a measurement of performance gains or battery longevity.

9. What winget export Could Not Record

Initially, I expected winget export to be the main installation record. In practice, many packages could not be exported because they were unavailable from a configured winget source. These included several Samsung, Intel, and NVIDIA packages, as well as Microsoft Store apps, Windows components, codecs, and OEM packages.

winget export is useful for packages that can be mapped back to package sources, but it is not a complete snapshot of a Windows installation. I therefore expanded the record beyond the export to include the observed installed state and system settings.

The baseline manifests were saved under D:\Lab\OfflineLab\manifests\.

FilePurpose
winget-productivity-baseline.jsonPackages that could be exported with a winget source association
winget-list-productivity-baseline.txtInstalled packages reported by winget
appx-productivity-baseline.txtAppX package inventory
installed-programs-productivity-baseline.txtClassic installed-program inventory
system-baseline.txtSystem baseline
storage-baseline.txtStorage baseline
known-folders-baseline.txtActual Known Folder paths

These records complement one another. Source matching, AppX packages, classic installed programs, and system and storage settings describe different parts of the environment. Keeping them together gives a more faithful basis for comparing the actual baseline, including items missing from the winget export.

An inventory does not make every package automatically reinstallable. This phase broadened the evidence available for rebuilding; collecting installers and preparing the recovery image remain later work.

10. Ready for the Research Development Layer

User files now belong under D:\UserData\, research assets under D:\Lab\, and the future recovery image under D:\Recovery\. Windows, the user profile and AppData, and applications remain on C:.

The implementation has made more than the folder names explicit. It defines which data should survive a C: recovery, removes the dependency on an unavailable OneDrive service, and records the installed state through several complementary manifests. Unnecessary consumer apps have been removed, productivity tools installed, browser roles defined, and Samsung battery and performance settings configured.

Git, the VS Code research configuration, Python, uv, Jupyter, WSL2, CUDA, PyTorch, Ollama, llama.cpp, and local LLMs have not yet been installed or configured. They belong to later notes in the series.

The workstation can now support everyday document work and research reading, with a recorded baseline against which to compare the next set of changes. The next task is to build the Windows-native research development environment on that foundation.


Share LinkedIn

Previous Note
Building a Clean Windows Baseline
Next Note
Building the Windows Research Development Baseline and Validating the WSL2 Gate