new folder structure
new imports for new folder structure
deletion of the old files