-from django.conf.urls import patterns, include, url
-from portal import views
-from portal.views import PresViewView, PlatformsView, PlatformView, ValidatePendingView, AccountView # UserRegisterView, UserValidateView
-from portal.dashboardview import DashboardView
-from portal.util import TemplateView
+from django.views.generic.base import TemplateView
+from django.conf.urls import patterns, include, url
+
+from portal.about import AboutView
+from portal.institution import InstitutionView
+from portal.usersview import UsersView
+from portal.manageuserview import UserView, user_process
+from portal.platformsview import PlatformsView
+from portal.platformview import PlatformView
+from portal.resourceview import ResourceView
+from portal.dashboardview import DashboardView
+from portal.accountview import AccountView, account_process
+from portal.contactview import ContactView
+from portal.slicerequestview import SliceRequestView
+from portal.registrationview import RegistrationView
+from portal.joinview import JoinView
+from portal.sliceviewold import SliceView
+from portal.validationview import ValidatePendingView
+#from portal.experimentview import ExperimentView
+from portal.termsview import TermsView
+from portal.univbrisview import UnivbrisView
+from portal.manualdelegationview import ManualDelegationView
+
+from portal.servicedirectory import ServiceDirectoryView
+
+from portal.documentationview import DocumentationView
+from portal.supportview import SupportView
+from portal.emailactivationview import ActivateEmailView
+# hopefully these should move in dedicated source files too
+from portal.views import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
+from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete