reorganized the file structure