Cleaning up in folder structure

Clean-up in the naming of folders