Some Cleanup and File movement