Reorganize file structure to match application.