diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/DispatcherPortlet.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/DispatcherPortlet.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/DispatcherPortlet.properties b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/DispatcherPortlet.properties
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/FrameworkPortlet.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/FrameworkPortlet.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/GenericPortletBean.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/GenericPortletBean.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerExceptionResolver.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerExceptionResolver.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerExecutionChain.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerExecutionChain.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerInterceptor.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerInterceptor.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/HandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/ModelAndView.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/ModelAndView.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/ModelAndViewDefiningException.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/ModelAndViewDefiningException.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/MissingPortletRequestParameterException.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/MissingPortletRequestParameterException.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestBindingException.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestBindingException.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestDataBinder.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestDataBinder.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestParameterPropertyValues.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestParameterPropertyValues.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestUtils.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/PortletRequestUtils.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/bind/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/AbstractRefreshablePortletApplicationContext.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/AbstractRefreshablePortletApplicationContext.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/ConfigurablePortletApplicationContext.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/ConfigurablePortletApplicationContext.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletApplicationContextUtils.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletApplicationContextUtils.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletApplicationObjectSupport.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletApplicationObjectSupport.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletConfigAware.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletConfigAware.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextAware.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextAware.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextAwareProcessor.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextAwareProcessor.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResource.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResource.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResourceLoader.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResourceLoader.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourceLoader.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResourcePatternResolver.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletContextResourcePatternResolver.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletRequestAttributes.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletRequestAttributes.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletRequestHandledEvent.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletRequestHandledEvent.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletWebRequest.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/PortletWebRequest.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/StaticPortletApplicationContext.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/StaticPortletApplicationContext.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/XmlPortletApplicationContext.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/XmlPortletApplicationContext.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/XmlPortletApplicationContext.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/context/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/AbstractHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/AbstractHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/AbstractMapBasedHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/AbstractMapBasedHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/HandlerInterceptorAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/HandlerInterceptorAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/ParameterHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/ParameterHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/ParameterMappingInterceptor.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/ParameterMappingInterceptor.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletContentGenerator.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletContentGenerator.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletModeHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletModeHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletModeParameterHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletModeParameterHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletSessionRequiredException.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/PortletSessionRequiredException.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimpleMappingExceptionResolver.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimpleMappingExceptionResolver.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimplePortletHandlerAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimplePortletHandlerAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimplePortletPostProcessor.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/SimplePortletPostProcessor.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/UserRoleAuthorizationInterceptor.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/UserRoleAuthorizationInterceptor.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/WebRequestHandlerInterceptorAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/handler/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/CommonsPortletMultipartResolver.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/CommonsPortletMultipartResolver.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/DefaultMultipartActionRequest.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/DefaultMultipartActionRequest.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/MultipartActionRequest.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/MultipartActionRequest.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/MultipartActionRequest.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/PortletMultipartResolver.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/PortletMultipartResolver.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/multipart/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/multipart/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractCommandController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractCommandController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractFormController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractFormController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractWizardFormController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/AbstractWizardFormController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/BaseCommandController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/BaseCommandController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/Controller.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/Controller.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/ParameterizableViewController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/ParameterizableViewController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/PortletModeNameViewController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/PortletModeNameViewController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/PortletWrappingController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/PortletWrappingController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/SimpleControllerHandlerAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/SimpleControllerHandlerAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/SimpleFormController.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/SimpleFormController.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/PortletAnnotationMappingUtils.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationMappingUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/annotation/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/mvc/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/package.html
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/ActionRequestWrapper.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/ActionRequestWrapper.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/ActionRequestWrapper.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/ActionRequestWrapper.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/PortletRequestWrapper.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletRequestWrapper.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/PortletRequestWrapper.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletRequestWrapper.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/PortletUtils.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/PortletUtils.java
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/package.html b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/package.html
similarity index 100%
rename from org.springframework.web.portlet/src/main/java/org/springframework/portlet/util/package.html
rename to org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/util/package.html