Finished changing the file structure.