UPDATE move base views to view folder