restructure for organization of files