Restructure files to allow for scalability