Added folderstructure