diff --git a/pom.xml b/pom.xml
index 29fbcf6..5ef8aa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.charego</groupId>
-    <artifactId>freecellfx</artifactId>
+    <artifactId>freecell</artifactId>
     <version>0.2</version>
 
     <organization>
@@ -33,6 +33,29 @@
                     <release>11</release>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>11.0</version>
+                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>3.5.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -45,7 +68,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>com.charego.freecellfx.FreeCellApplication</mainClass>
+                    <mainClass>com.charego.freecell.FreeCellApplication</mainClass>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/com/charego/freecellfx/FreeCellApplication.java b/src/main/java/com/charego/freecell/FreeCellApplication.java
similarity index 87%
rename from src/main/java/com/charego/freecellfx/FreeCellApplication.java
rename to src/main/java/com/charego/freecell/FreeCellApplication.java
index 088ab37..15b6586 100644
--- a/src/main/java/com/charego/freecellfx/FreeCellApplication.java
+++ b/src/main/java/com/charego/freecell/FreeCellApplication.java
@@ -1,8 +1,8 @@
-package com.charego.freecellfx;
+package com.charego.freecell;
 
-import com.charego.freecellfx.model.Game;
-import com.charego.freecellfx.view.GameCanvas;
-import com.charego.freecellfx.view.GameMenuBar;
+import com.charego.freecell.model.Game;
+import com.charego.freecell.view.GameCanvas;
+import com.charego.freecell.view.GameMenuBar;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
diff --git a/src/main/java/com/charego/freecellfx/model/Card.java b/src/main/java/com/charego/freecell/model/Card.java
similarity index 96%
rename from src/main/java/com/charego/freecellfx/model/Card.java
rename to src/main/java/com/charego/freecell/model/Card.java
index 2d94625..0c22e36 100644
--- a/src/main/java/com/charego/freecellfx/model/Card.java
+++ b/src/main/java/com/charego/freecell/model/Card.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
-import com.charego.freecellfx.util.DoubleKeyedMap;
+import com.charego.freecell.util.DoubleKeyedMap;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
 
diff --git a/src/main/java/com/charego/freecellfx/model/Deck.java b/src/main/java/com/charego/freecell/model/Deck.java
similarity index 86%
rename from src/main/java/com/charego/freecellfx/model/Deck.java
rename to src/main/java/com/charego/freecell/model/Deck.java
index 9b2946d..4ce22c7 100644
--- a/src/main/java/com/charego/freecellfx/model/Deck.java
+++ b/src/main/java/com/charego/freecell/model/Deck.java
@@ -1,7 +1,7 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
-import com.charego.freecellfx.model.Card.Rank;
-import com.charego.freecellfx.model.Card.Suit;
+import com.charego.freecell.model.Card.Rank;
+import com.charego.freecell.model.Card.Suit;
 
 import java.util.Collections;
 import java.util.Deque;
diff --git a/src/main/java/com/charego/freecellfx/model/Game.java b/src/main/java/com/charego/freecell/model/Game.java
similarity index 91%
rename from src/main/java/com/charego/freecellfx/model/Game.java
rename to src/main/java/com/charego/freecell/model/Game.java
index 0e9ac32..a83a763 100644
--- a/src/main/java/com/charego/freecellfx/model/Game.java
+++ b/src/main/java/com/charego/freecell/model/Game.java
@@ -1,13 +1,13 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.charego.freecellfx.model.action.MoveAction;
-import com.charego.freecellfx.model.pile.Cell;
-import com.charego.freecellfx.model.pile.Foundation;
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.pile.Tableau;
+import com.charego.freecell.model.action.MoveAction;
+import com.charego.freecell.model.pile.Cell;
+import com.charego.freecell.model.pile.Foundation;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.pile.Tableau;
 
 public class Game {
 	private List<Cell> cells = new ArrayList<>(4);
diff --git a/src/main/java/com/charego/freecellfx/model/MoveTracker.java b/src/main/java/com/charego/freecell/model/MoveTracker.java
similarity index 92%
rename from src/main/java/com/charego/freecellfx/model/MoveTracker.java
rename to src/main/java/com/charego/freecell/model/MoveTracker.java
index 83a3fb3..3b453b9 100644
--- a/src/main/java/com/charego/freecellfx/model/MoveTracker.java
+++ b/src/main/java/com/charego/freecell/model/MoveTracker.java
@@ -1,9 +1,9 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
 import java.util.Deque;
 import java.util.LinkedList;
 
-import com.charego.freecellfx.model.action.MoveAction;
+import com.charego.freecell.model.action.MoveAction;
 
 /**
  * Records moves to enable redo and undo actions.
diff --git a/src/main/java/com/charego/freecellfx/model/action/Action.java b/src/main/java/com/charego/freecell/model/action/Action.java
similarity index 56%
rename from src/main/java/com/charego/freecellfx/model/action/Action.java
rename to src/main/java/com/charego/freecell/model/action/Action.java
index d1e4460..56e1862 100644
--- a/src/main/java/com/charego/freecellfx/model/action/Action.java
+++ b/src/main/java/com/charego/freecell/model/action/Action.java
@@ -1,4 +1,4 @@
-package com.charego.freecellfx.model.action;
+package com.charego.freecell.model.action;
 
 public interface Action {
 	void redo();
diff --git a/src/main/java/com/charego/freecellfx/model/action/MoveAction.java b/src/main/java/com/charego/freecell/model/action/MoveAction.java
similarity index 88%
rename from src/main/java/com/charego/freecellfx/model/action/MoveAction.java
rename to src/main/java/com/charego/freecell/model/action/MoveAction.java
index 32bdb5d..996ce7a 100644
--- a/src/main/java/com/charego/freecellfx/model/action/MoveAction.java
+++ b/src/main/java/com/charego/freecell/model/action/MoveAction.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.action;
+package com.charego.freecell.model.action;
 
-import com.charego.freecellfx.model.pile.Pile;
+import com.charego.freecell.model.pile.Pile;
 
 public class MoveAction implements Action {
 	private final Pile fromPile;
diff --git a/src/main/java/com/charego/freecellfx/model/pile/AbstractPile.java b/src/main/java/com/charego/freecell/model/pile/AbstractPile.java
similarity index 88%
rename from src/main/java/com/charego/freecellfx/model/pile/AbstractPile.java
rename to src/main/java/com/charego/freecell/model/pile/AbstractPile.java
index da94d46..eb95632 100644
--- a/src/main/java/com/charego/freecellfx/model/pile/AbstractPile.java
+++ b/src/main/java/com/charego/freecell/model/pile/AbstractPile.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/main/java/com/charego/freecellfx/model/pile/Cell.java b/src/main/java/com/charego/freecell/model/pile/Cell.java
similarity index 92%
rename from src/main/java/com/charego/freecellfx/model/pile/Cell.java
rename to src/main/java/com/charego/freecell/model/pile/Cell.java
index 5b37e99..fb9b973 100644
--- a/src/main/java/com/charego/freecellfx/model/pile/Cell.java
+++ b/src/main/java/com/charego/freecell/model/pile/Cell.java
@@ -1,4 +1,4 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
 public class Cell extends AbstractPile {
 
diff --git a/src/main/java/com/charego/freecellfx/model/pile/Foundation.java b/src/main/java/com/charego/freecell/model/pile/Foundation.java
similarity index 84%
rename from src/main/java/com/charego/freecellfx/model/pile/Foundation.java
rename to src/main/java/com/charego/freecell/model/pile/Foundation.java
index ae9c71e..c2071f8 100644
--- a/src/main/java/com/charego/freecellfx/model/pile/Foundation.java
+++ b/src/main/java/com/charego/freecell/model/pile/Foundation.java
@@ -1,7 +1,7 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import static com.charego.freecellfx.model.Card.Rank;
-import static com.charego.freecellfx.model.Card.Suit;
+import static com.charego.freecell.model.Card.Rank;
+import static com.charego.freecell.model.Card.Suit;
 
 public class Foundation extends AbstractPile {
 
diff --git a/src/main/java/com/charego/freecellfx/model/pile/Pile.java b/src/main/java/com/charego/freecell/model/pile/Pile.java
similarity index 92%
rename from src/main/java/com/charego/freecellfx/model/pile/Pile.java
rename to src/main/java/com/charego/freecell/model/pile/Pile.java
index 1791197..989b072 100644
--- a/src/main/java/com/charego/freecellfx/model/pile/Pile.java
+++ b/src/main/java/com/charego/freecell/model/pile/Pile.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 public interface Pile extends Iterable<Card> {
 
diff --git a/src/main/java/com/charego/freecellfx/model/pile/Tableau.java b/src/main/java/com/charego/freecell/model/pile/Tableau.java
similarity index 97%
rename from src/main/java/com/charego/freecellfx/model/pile/Tableau.java
rename to src/main/java/com/charego/freecell/model/pile/Tableau.java
index c4cbb87..1516971 100644
--- a/src/main/java/com/charego/freecellfx/model/pile/Tableau.java
+++ b/src/main/java/com/charego/freecell/model/pile/Tableau.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/src/main/java/com/charego/freecellfx/util/DoubleKeyedMap.java b/src/main/java/com/charego/freecell/util/DoubleKeyedMap.java
similarity index 95%
rename from src/main/java/com/charego/freecellfx/util/DoubleKeyedMap.java
rename to src/main/java/com/charego/freecell/util/DoubleKeyedMap.java
index 3a1b60d..4fee33f 100644
--- a/src/main/java/com/charego/freecellfx/util/DoubleKeyedMap.java
+++ b/src/main/java/com/charego/freecell/util/DoubleKeyedMap.java
@@ -1,4 +1,4 @@
-package com.charego.freecellfx.util;
+package com.charego.freecell.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/charego/freecellfx/view/GameCanvas.java b/src/main/java/com/charego/freecell/view/GameCanvas.java
similarity index 91%
rename from src/main/java/com/charego/freecellfx/view/GameCanvas.java
rename to src/main/java/com/charego/freecell/view/GameCanvas.java
index 4aa519e..624f3c5 100644
--- a/src/main/java/com/charego/freecellfx/view/GameCanvas.java
+++ b/src/main/java/com/charego/freecell/view/GameCanvas.java
@@ -1,11 +1,11 @@
-package com.charego.freecellfx.view;
+package com.charego.freecell.view;
 
-import com.charego.freecellfx.model.Card;
-import com.charego.freecellfx.model.Game;
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.view.pile.CascadingPileView;
-import com.charego.freecellfx.view.pile.PileView;
-import com.charego.freecellfx.view.pile.StackedPileView;
+import com.charego.freecell.model.Card;
+import com.charego.freecell.model.Game;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.view.pile.CascadingPileView;
+import com.charego.freecell.view.pile.PileView;
+import com.charego.freecell.view.pile.StackedPileView;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.canvas.Canvas;
diff --git a/src/main/java/com/charego/freecellfx/view/GameMenuBar.java b/src/main/java/com/charego/freecell/view/GameMenuBar.java
similarity index 97%
rename from src/main/java/com/charego/freecellfx/view/GameMenuBar.java
rename to src/main/java/com/charego/freecell/view/GameMenuBar.java
index 858eb6a..19b8592 100644
--- a/src/main/java/com/charego/freecellfx/view/GameMenuBar.java
+++ b/src/main/java/com/charego/freecell/view/GameMenuBar.java
@@ -1,4 +1,4 @@
-package com.charego.freecellfx.view;
+package com.charego.freecell.view;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
diff --git a/src/main/java/com/charego/freecellfx/view/pile/CascadingPileView.java b/src/main/java/com/charego/freecell/view/pile/CascadingPileView.java
similarity index 86%
rename from src/main/java/com/charego/freecellfx/view/pile/CascadingPileView.java
rename to src/main/java/com/charego/freecell/view/pile/CascadingPileView.java
index 0a00fed..ee0b034 100644
--- a/src/main/java/com/charego/freecellfx/view/pile/CascadingPileView.java
+++ b/src/main/java/com/charego/freecell/view/pile/CascadingPileView.java
@@ -1,8 +1,8 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.Card;
-import com.charego.freecellfx.model.pile.Tableau;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.Card;
+import com.charego.freecell.model.pile.Tableau;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 
diff --git a/src/main/java/com/charego/freecellfx/view/pile/PileView.java b/src/main/java/com/charego/freecell/view/pile/PileView.java
similarity index 85%
rename from src/main/java/com/charego/freecellfx/view/pile/PileView.java
rename to src/main/java/com/charego/freecell/view/pile/PileView.java
index 27c3060..0a63cd3 100644
--- a/src/main/java/com/charego/freecellfx/view/pile/PileView.java
+++ b/src/main/java/com/charego/freecell/view/pile/PileView.java
@@ -1,6 +1,6 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
+import com.charego.freecell.model.pile.Pile;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 
diff --git a/src/main/java/com/charego/freecellfx/view/pile/StackedPileView.java b/src/main/java/com/charego/freecell/view/pile/StackedPileView.java
similarity index 81%
rename from src/main/java/com/charego/freecellfx/view/pile/StackedPileView.java
rename to src/main/java/com/charego/freecell/view/pile/StackedPileView.java
index 6a86ccc..923b867 100644
--- a/src/main/java/com/charego/freecellfx/view/pile/StackedPileView.java
+++ b/src/main/java/com/charego/freecell/view/pile/StackedPileView.java
@@ -1,7 +1,7 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.Card;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 05114ce..2c093a2 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,3 +1,3 @@
-module com.charego.freecellfx {
+module com.charego.freecell {
 	requires javafx.controls;
 }