cleaning up files and directories that should have been git mv'd