Fix file structure, and remove unused move script