Rename folders to be more type agnostic