[WCP-36] [WCP-38] - Moved portlet controllers and servlet controllers to
there own packages and changed the configuration for Spring to reflect
that correctly.