Comming a new file structure for organization