Some file structure changes