Change the position of some file. Remove unused references
Merge branch 'hotfix' of https://github.com/comiscienceknight/MetroExplorer into hotfix