Use the new folder-layout