Do you only have 1 drive?
I always separate the OS on 1(or more) drive and the data on different drives. Then it makes it simple to either replace or expand the data drive. If it's a separate drive, then just back-up the entire drive, replace it with the new drive, and restore the data.