Renaming some packages to plural, moving views in their own package