Changed the file structure slightly