restructuring the file structure