Cleanup and some file movement