Cleanup and folder-hierarchy