Reorganized the file structure