Updated folderstructure