#338 New folderstructure