fixed folderstructure