make folder structure nicer