Second attempt at moving stuff.
Removed old files