Made some file structure changes for the future