Changed the file structure