Change the file structure for more scalability