changed folder-structure