Rename some folders to be more generic