reorganize content into correct sub folders WIP