some file structure changes