Some rework
Continue moving to disk C