Folder tidy up

as discussed i re-arranged the folders