Change the position of some file. Remove unused references