Move bikeshed widget samples from bikeshed/sample to sample/bikeshed
Note: you may need to update Eclipse launch configs to remove stale bikeshed/sample/...  arguments


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7767 8db76d5a-ed1c-0410-87a9-c151d255dfc7

bikeshed/eclipse.README

diff --git a/bikeshed/eclipse.README b/bikeshed/eclipse.README
index b3323db..73a1c00 100644
--- a/bikeshed/eclipse.README
+++ b/bikeshed/eclipse.README
@@ -26,7 +26,7 @@
   * Google > App Engine > Use Google App Engine
   * Google > App Engine > ORM
     * Remove src and test
-    * Add server and shared from src/com/google/gwt/bikeshed/sample/stocks
+    * Add server and shared from src/com/google/gwt/sample/bikeshed/stocks
   * Java Build Path > Libraries > Add Variable > GWT_TOOLS, Extend > redist/json/r2_20080312/json.jar
 * Copy tools/redist/json/r2_20080312/json.jar to bikeshed/war/WEB_INF/lib
 * Right click on the bikeshed project and choose Run as > Web Application. Choose from the various .html files

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/StockSample.gwt.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/StockSample.gwt.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/StockSample.gwt.xml
similarity index 91%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/StockSample.gwt.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/StockSample.gwt.xml
index 5c2284b..c3c3ef4 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/StockSample.gwt.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/StockSample.gwt.xml
@@ -8,7 +8,7 @@
   <inherits name='com.google.gwt.bikeshed.tree.Tree'/>
 
   <!-- Specify the app entry point class.                         -->
-  <entry-point class='com.google.gwt.bikeshed.sample.stocks.client.StockSample'/>
+  <entry-point class='com.google.gwt.sample.bikeshed.stocks.client.StockSample'/>
 
   <!-- Specify the paths for translatable code                    -->
   <source path='client'/>

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/BuySellPopup.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/BuySellPopup.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/BuySellPopup.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/BuySellPopup.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/BuySellPopup.java
index b8e9cc9..5767958 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/BuySellPopup.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/BuySellPopup.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.KeyUpEvent;
 import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.i18n.client.NumberFormat;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.Window;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/ChangeCell.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/ChangeCell.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/ChangeCell.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/ChangeCell.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/ChangeCell.java
index 9e3a4e5..61efe6f 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/ChangeCell.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/ChangeCell.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.Cell;
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Columns.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Columns.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Columns.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Columns.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Columns.java
index 3bacd1b..cc8d61e 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Columns.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Columns.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.ButtonCell;
 import com.google.gwt.bikeshed.cells.client.CheckboxCell;
@@ -21,8 +21,8 @@
 import com.google.gwt.bikeshed.cells.client.ProfitLossCell;
 import com.google.gwt.bikeshed.cells.client.TextCell;
 import com.google.gwt.bikeshed.list.client.Column;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 
 /**
  * Column definitions for the stock demo.

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.java
similarity index 94%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.java
index ef2f97e..5253d60 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.list.client.PagingTableListView;
 import com.google.gwt.bikeshed.list.client.TextHeader;
 import com.google.gwt.bikeshed.list.shared.ListModel;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiFactory;
 import com.google.gwt.uibinder.client.UiField;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.ui.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.ui.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.ui.xml
similarity index 90%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.ui.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.ui.xml
index 958e10b..9381b4d 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/FavoritesWidget.ui.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/FavoritesWidget.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:l='urn:import:com.google.gwt.bikeshed.list.client'
   xmlns:t='urn:import:com.google.gwt.bikeshed.tree.client'
-  xmlns:s='urn:import:com.google.gwt.bikeshed.sample.stocks.client'>
+  xmlns:s='urn:import:com.google.gwt.sample.bikeshed.stocks.client'>
 
   <ui:style field='common' src='common.css'/>
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/HighlightingTextCell.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/HighlightingTextCell.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/HighlightingTextCell.java
similarity index 97%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/HighlightingTextCell.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/HighlightingTextCell.java
index 304da2c..08ec76d 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/HighlightingTextCell.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/HighlightingTextCell.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.Cell;
 import com.google.gwt.regexp.shared.MatchResult;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.java
index 82f687c..4c18352 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.Cell;
 import com.google.gwt.bikeshed.list.client.SimpleCellList;
 import com.google.gwt.bikeshed.list.shared.ListModel;
-import com.google.gwt.bikeshed.sample.stocks.shared.PlayerInfo;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.sample.bikeshed.stocks.shared.PlayerInfo;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiFactory;
 import com.google.gwt.uibinder.client.UiField;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.ui.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.ui.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.ui.xml
similarity index 90%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.ui.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.ui.xml
index 2ef659a..cda1e9a 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/PlayerScoresWidget.ui.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/PlayerScoresWidget.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:l='urn:import:com.google.gwt.bikeshed.list.client'
   xmlns:t='urn:import:com.google.gwt.bikeshed.tree.client'
-  xmlns:s='urn:import:com.google.gwt.bikeshed.sample.stocks.client'>
+  xmlns:s='urn:import:com.google.gwt.sample.bikeshed.stocks.client'>
 
   <ui:style field='common' src='common.css'/>
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.java
index 66b4e49..552f692 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.list.client.PagingTableListView;
 import com.google.gwt.bikeshed.list.client.TextHeader;
 import com.google.gwt.bikeshed.list.shared.ListModel;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.KeyUpEvent;
 import com.google.gwt.event.dom.client.KeyUpHandler;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiFactory;
 import com.google.gwt.uibinder.client.UiField;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.ui.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.ui.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.ui.xml
similarity index 91%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.ui.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.ui.xml
index 15bac17..5abfbae 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQueryWidget.ui.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQueryWidget.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:l='urn:import:com.google.gwt.bikeshed.list.client'
   xmlns:t='urn:import:com.google.gwt.bikeshed.tree.client'
-  xmlns:s='urn:import:com.google.gwt.bikeshed.sample.stocks.client'>
+  xmlns:s='urn:import:com.google.gwt.sample.bikeshed.stocks.client'>
 
   <ui:style field='common' src='common.css'/>
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQuoteCell.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQuoteCell.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQuoteCell.java
similarity index 88%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQuoteCell.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQuoteCell.java
index 418929c..b64f1ef 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockQuoteCell.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockQuoteCell.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.Cell;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
 
 /**
  * A cell that represents a {@link StockQuote}.

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.java
index e9e559f..30d76ef 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.java
@@ -13,19 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.FieldUpdater;
 import com.google.gwt.bikeshed.list.shared.AsyncListModel;
 import com.google.gwt.bikeshed.list.shared.ListListModel;
 import com.google.gwt.bikeshed.list.shared.Range;
-import com.google.gwt.bikeshed.sample.stocks.client.TransactionTreeViewModel.SectorListModel;
-import com.google.gwt.bikeshed.sample.stocks.shared.PlayerInfo;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuoteList;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockRequest;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockResponse;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
 import com.google.gwt.bikeshed.tree.client.SideBySideTreeView;
 import com.google.gwt.bikeshed.tree.client.TreeNode;
 import com.google.gwt.core.client.EntryPoint;
@@ -33,6 +26,13 @@
 import com.google.gwt.event.logical.shared.CloseEvent;
 import com.google.gwt.event.logical.shared.CloseHandler;
 import com.google.gwt.i18n.client.NumberFormat;
+import com.google.gwt.sample.bikeshed.stocks.client.TransactionTreeViewModel.SectorListModel;
+import com.google.gwt.sample.bikeshed.stocks.shared.PlayerInfo;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuoteList;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockRequest;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockResponse;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiFactory;
 import com.google.gwt.uibinder.client.UiField;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.ui.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.ui.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.ui.xml
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.ui.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.ui.xml
index e34762c..77670d2 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockSample.ui.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockSample.ui.xml
@@ -3,7 +3,7 @@
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   xmlns:l='urn:import:com.google.gwt.bikeshed.list.client'
   xmlns:t='urn:import:com.google.gwt.bikeshed.tree.client'
-  xmlns:s='urn:import:com.google.gwt.bikeshed.sample.stocks.client'>
+  xmlns:s='urn:import:com.google.gwt.sample.bikeshed.stocks.client'>
 
   <ui:style field='common' src='common.css'/>
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockService.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockService.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockService.java
similarity index 83%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockService.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockService.java
index c9b3578..96d53f5 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockService.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockService.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.list.shared.Range;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockRequest;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockResponse;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockRequest;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockResponse;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockServiceAsync.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockServiceAsync.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockServiceAsync.java
similarity index 82%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockServiceAsync.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockServiceAsync.java
index f57eeb5..7a6ad34 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/StockServiceAsync.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/StockServiceAsync.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.list.shared.Range;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockRequest;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockResponse;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockRequest;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockResponse;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
 /**

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/TransactionTreeViewModel.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/TransactionTreeViewModel.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/TransactionTreeViewModel.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/TransactionTreeViewModel.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/TransactionTreeViewModel.java
index 01a818d..26420b5 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/TransactionTreeViewModel.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/TransactionTreeViewModel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
 import com.google.gwt.bikeshed.cells.client.ButtonCell;
 import com.google.gwt.bikeshed.cells.client.Cell;
@@ -22,10 +22,10 @@
 import com.google.gwt.bikeshed.list.shared.AsyncListModel;
 import com.google.gwt.bikeshed.list.shared.ListListModel;
 import com.google.gwt.bikeshed.list.shared.ListModel;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
 import com.google.gwt.bikeshed.tree.client.TreeNode;
 import com.google.gwt.bikeshed.tree.client.TreeViewModel;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 
 import java.util.HashMap;
 import java.util.List;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Updater.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Updater.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Updater.java
similarity index 87%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Updater.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Updater.java
index e49da1b..de58000 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/Updater.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/Updater.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.client;
+package com.google.gwt.sample.bikeshed.stocks.client;
 
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
 
 /**
  * Bridge between StockSample and StockQueryWidget.

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/common.css

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/common.css b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/common.css
similarity index 100%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/client/common.css
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/client/common.css

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/GoogleFinance.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/GoogleFinance.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/GoogleFinance.java
similarity index 98%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/GoogleFinance.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/GoogleFinance.java
index 16b9c94..fbd83df 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/GoogleFinance.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/GoogleFinance.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.server;
+package com.google.gwt.sample.bikeshed.stocks.server;
 
 import java.io.IOException;
 import java.io.InputStream;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/PlayerStatus.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/PlayerStatus.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/PlayerStatus.java
similarity index 97%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/PlayerStatus.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/PlayerStatus.java
index 781ef08..98c7263 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/PlayerStatus.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/PlayerStatus.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.server;
+package com.google.gwt.sample.bikeshed.stocks.server;
 
-import com.google.gwt.bikeshed.sample.stocks.shared.PlayerInfo;
+import com.google.gwt.sample.bikeshed.stocks.shared.PlayerInfo;
 
 import java.util.HashMap;
 import java.util.TreeSet;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/StockServiceImpl.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/StockServiceImpl.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/StockServiceImpl.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/StockServiceImpl.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/StockServiceImpl.java
index b75dba1..6af69bb 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/StockServiceImpl.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/StockServiceImpl.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.server;
+package com.google.gwt.sample.bikeshed.stocks.server;
 
 import com.google.appengine.api.users.User;
 import com.google.appengine.api.users.UserService;
 import com.google.appengine.api.users.UserServiceFactory;
 import com.google.gwt.bikeshed.list.shared.Range;
 import com.google.gwt.bikeshed.list.shared.AbstractListModel.DefaultRange;
-import com.google.gwt.bikeshed.sample.stocks.client.StockService;
-import com.google.gwt.bikeshed.sample.stocks.shared.PlayerInfo;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuote;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockQuoteList;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockRequest;
-import com.google.gwt.bikeshed.sample.stocks.shared.StockResponse;
-import com.google.gwt.bikeshed.sample.stocks.shared.Transaction;
+import com.google.gwt.sample.bikeshed.stocks.client.StockService;
+import com.google.gwt.sample.bikeshed.stocks.shared.PlayerInfo;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuote;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockQuoteList;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockRequest;
+import com.google.gwt.sample.bikeshed.stocks.shared.StockResponse;
+import com.google.gwt.sample.bikeshed.stocks.shared.Transaction;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
 import java.util.ArrayList;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/Stocks.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/Stocks.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/Stocks.java
similarity index 97%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/Stocks.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/Stocks.java
index f14fe98..1778de6 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/server/Stocks.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/server/Stocks.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.server;
+package com.google.gwt.sample.bikeshed.stocks.server;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/PlayerInfo.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/PlayerInfo.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/PlayerInfo.java
similarity index 98%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/PlayerInfo.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/PlayerInfo.java
index 4738bc9..c3a3ce1 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/PlayerInfo.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/PlayerInfo.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import java.io.Serializable;
 import java.util.LinkedList;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuote.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuote.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuote.java
similarity index 97%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuote.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuote.java
index da9cf09..c279d09 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuote.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuote.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import java.io.Serializable;
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuoteList.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuoteList.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuoteList.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuoteList.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuoteList.java
index 85974ca..5909def 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockQuoteList.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockQuoteList.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import java.util.ArrayList;
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockRequest.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockRequest.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockRequest.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockRequest.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockRequest.java
index dee4beb..5d3087d 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockRequest.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockRequest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import com.google.gwt.bikeshed.list.shared.Range;
 

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockResponse.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockResponse.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockResponse.java
similarity index 97%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockResponse.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockResponse.java
index 3ba1446..56db23e 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/StockResponse.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/StockResponse.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import java.io.Serializable;
 import java.util.List;

bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/Transaction.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/Transaction.java b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/Transaction.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/Transaction.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/Transaction.java
index 0b637a6..dd50b3f 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/stocks/shared/Transaction.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/stocks/shared/Transaction.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.stocks.shared;
+package com.google.gwt.sample.bikeshed.stocks.shared;
 
 import com.google.gwt.i18n.client.NumberFormat;
 

bikeshed/src/com/google/gwt/sample/bikeshed/tree/TreeSample.gwt.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/TreeSample.gwt.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/TreeSample.gwt.xml
similarity index 94%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/TreeSample.gwt.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/TreeSample.gwt.xml
index 802fdd7..5b4c821 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/TreeSample.gwt.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/TreeSample.gwt.xml
@@ -16,7 +16,7 @@
   <!-- Other module inherits                                      -->
 
   <!-- Specify the app entry point class.                         -->
-  <entry-point class='com.google.gwt.bikeshed.sample.tree.client.TreeSample'/>
+  <entry-point class='com.google.gwt.sample.bikeshed.tree.client.TreeSample'/>
 
   <!-- Specify the paths for translatable code                    -->
   <source path='client'/>

bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/MyTreeViewModel.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/MyTreeViewModel.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/MyTreeViewModel.java
similarity index 98%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/MyTreeViewModel.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/MyTreeViewModel.java
index 5cfd225..9de536d 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/MyTreeViewModel.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/MyTreeViewModel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.client;
+package com.google.gwt.sample.bikeshed.tree.client;
 
 import com.google.gwt.bikeshed.cells.client.ButtonCell;
 import com.google.gwt.bikeshed.cells.client.Cell;

bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeSample.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeSample.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeSample.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeSample.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeSample.java
index 26c93be..ce4a05e 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeSample.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeSample.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.client;
+package com.google.gwt.sample.bikeshed.tree.client;
 
 import com.google.gwt.bikeshed.tree.client.SideBySideTreeView;
 import com.google.gwt.bikeshed.tree.client.StandardTreeView;

bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeService.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeService.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeService.java
similarity index 94%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeService.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeService.java
index 2b2f7ae..8b245bf 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeService.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.client;
+package com.google.gwt.sample.bikeshed.tree.client;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeServiceAsync.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeServiceAsync.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeServiceAsync.java
similarity index 93%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeServiceAsync.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeServiceAsync.java
index 8f1bc03..211d5b2 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/client/TreeServiceAsync.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/client/TreeServiceAsync.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.client;
+package com.google.gwt.sample.bikeshed.tree.client;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/Dictionary.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/Dictionary.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/Dictionary.java
similarity index 99%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/Dictionary.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/Dictionary.java
index 8e5b4e6..233d2f3 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/Dictionary.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/Dictionary.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.server;
+package com.google.gwt.sample.bikeshed.tree.server;
 
 import java.util.ArrayList;
 import java.util.List;

bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/TreeServiceImpl.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/TreeServiceImpl.java b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/TreeServiceImpl.java
similarity index 88%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/TreeServiceImpl.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/TreeServiceImpl.java
index 5c468b7..de18642 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/tree/server/TreeServiceImpl.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/tree/server/TreeServiceImpl.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.tree.server;
+package com.google.gwt.sample.bikeshed.tree.server;
 
-import com.google.gwt.bikeshed.sample.tree.client.TreeService;
+import com.google.gwt.sample.bikeshed.tree.client.TreeService;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
 import java.util.List;

bikeshed/src/com/google/gwt/sample/bikeshed/validation/Validation.gwt.xml

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/Validation.gwt.xml b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/Validation.gwt.xml
similarity index 88%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/validation/Validation.gwt.xml
rename to bikeshed/src/com/google/gwt/sample/bikeshed/validation/Validation.gwt.xml
index ea4cccf..e422947 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/Validation.gwt.xml
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/Validation.gwt.xml
@@ -5,6 +5,6 @@
 	<inherits name="com.google.gwt.bikeshed.list.List" />
 	<source path="client" />
 	<entry-point
-		class="com.google.gwt.bikeshed.sample.validation.client.Validation">
+		class="com.google.gwt.sample.bikeshed.validation.client.Validation">
 	</entry-point>
 </module>

bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableField.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableField.java b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableField.java
similarity index 96%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableField.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableField.java
index 646df5e..bd59e94 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableField.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableField.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.validation.client;
+package com.google.gwt.sample.bikeshed.validation.client;
 
 /**
  * A field with a pending value and an 'is invalid' flag.

bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableInputCell.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableInputCell.java b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableInputCell.java
similarity index 95%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableInputCell.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableInputCell.java
index 496d84b..344cfb1 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/ValidatableInputCell.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/ValidatableInputCell.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.validation.client;
+package com.google.gwt.sample.bikeshed.validation.client;
 
 import com.google.gwt.bikeshed.cells.client.Cell;
 import com.google.gwt.bikeshed.cells.client.ValueUpdater;
-import com.google.gwt.bikeshed.sample.validation.client.ValidatableField.DefaultValidatableField;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.InputElement;
 import com.google.gwt.dom.client.NativeEvent;
+import com.google.gwt.sample.bikeshed.validation.client.ValidatableField.DefaultValidatableField;
 
 /**
  * A String {@link Cell} that supports validation using a

bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/Validation.java

diff --git a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/Validation.java b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/Validation.java
similarity index 98%
rename from bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/Validation.java
rename to bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/Validation.java
index a2c6eff..88addf7 100644
--- a/bikeshed/src/com/google/gwt/bikeshed/sample/validation/client/Validation.java
+++ b/bikeshed/src/com/google/gwt/sample/bikeshed/validation/client/Validation.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.bikeshed.sample.validation.client;
+package com.google.gwt.sample.bikeshed.validation.client;
 
 import com.google.gwt.bikeshed.cells.client.FieldUpdater;
 import com.google.gwt.bikeshed.cells.client.TextCell;

bikeshed/war/WEB-INF/web.xml

diff --git a/bikeshed/war/WEB-INF/web.xml b/bikeshed/war/WEB-INF/web.xml
index 38aa974..096e396 100644
--- a/bikeshed/war/WEB-INF/web.xml
+++ b/bikeshed/war/WEB-INF/web.xml
@@ -13,12 +13,12 @@
 
   <servlet>
     <servlet-name>stockServlet</servlet-name>
-    <servlet-class>com.google.gwt.bikeshed.sample.stocks.server.StockServiceImpl</servlet-class>
+    <servlet-class>com.google.gwt.sample.bikeshed.stocks.server.StockServiceImpl</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>treeServlet</servlet-name>
-    <servlet-class>com.google.gwt.bikeshed.sample.tree.server.TreeServiceImpl</servlet-class>
+    <servlet-class>com.google.gwt.sample.bikeshed.tree.server.TreeServiceImpl</servlet-class>
   </servlet>
 
   <servlet-mapping>