minor changes to folder-structure