diff --git a/samples/mobilewebapp/src/META-INF/jdoconfig.xml b/samples/mobilewebapp/src/main/META-INF/jdoconfig.xml
similarity index 100%
rename from samples/mobilewebapp/src/META-INF/jdoconfig.xml
rename to samples/mobilewebapp/src/main/META-INF/jdoconfig.xml
diff --git a/samples/mobilewebapp/src/META-INF/persistence.xml b/samples/mobilewebapp/src/main/META-INF/persistence.xml
similarity index 100%
rename from samples/mobilewebapp/src/META-INF/persistence.xml
rename to samples/mobilewebapp/src/main/META-INF/persistence.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppRequestFactory.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppRequestFactory.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppRequestFactory.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppRequestFactory.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShellBase.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShellBase.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShellBase.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShellBase.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/TaskRequest.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/TaskRequest.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/TaskRequest.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/TaskRequest.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/server/domain/Task.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/Task.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/server/domain/Task.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/Task.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java
diff --git a/samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java b/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java
similarity index 100%
rename from samples/mobilewebapp/src/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java
rename to samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java
diff --git a/samples/mobilewebapp/src/log4j.properties b/samples/mobilewebapp/src/main/log4j.properties
similarity index 100%
rename from samples/mobilewebapp/src/log4j.properties
rename to samples/mobilewebapp/src/main/log4j.properties
diff --git a/samples/mobilewebapp/user-build.xml b/samples/mobilewebapp/user-build.xml
index df1a7fa..810a54e 100644
--- a/samples/mobilewebapp/user-build.xml
+++ b/samples/mobilewebapp/user-build.xml
@@ -3,7 +3,7 @@
   <property file="local.properties" />
   <!-- Arguments to gwtc and devmode targets -->
   <property name="gwt.args" value="" />
-  <property name="src.dir" value="src" />
+  <property name="src.dir" value="src/main" />
   <property name="war.dir" value="war" />
   <property name="gwt.sdk" value="../.." />