diff --git a/README.adoc b/README.adoc
index 1682e7e11a57b3d03dbb95dbeee68b81ea41adf0..077aae79ae5af1ceb02a456d8bed34802667e5d7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -816,7 +816,7 @@ We will change the type of the original state field, from `String` to a new clas
.To-Do
****
-. Create a new class named `PermissionState`.
+. Create a new class named `PermissionState` inside package `fr.rtp.simplification.condwithstate`.
. Copy the `state` field to `PermissionState` and make it private and final. A value will be set for this field only from the constructor.
@@ -839,7 +839,7 @@ public class PermissionState {
----
. Move state constants to class `PermissionState`.
-.. Click on constant `REQUESTED`, then go to menu:Refactor[Move Members...], and move the constant to class `fr.unantes.sce.temp.PermissionState`.
+.. Click on constant `REQUESTED`, then go to menu:Refactor[Move Members...], and move the constant to class `fr.rtp.simplification.condwithstate.PermissionState`.
.. Change the types and the initialization values of the constants `REQUESTED`, `CLAIMED`, `GRANTED`, and `DENIED`.
Each field initialization creates an instance of `PermissionState` corresponding to this value of `state`.
+
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionClaimed.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionClaimed.java
deleted file mode 100644
index db17d864f0460349ff4c4443bc9e7694b6341deb..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionClaimed.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-import fr.rtp.simplification.condwithstate.SystemAdmin;
-
-class PermissionClaimed extends PermissionState {
- public PermissionClaimed() {
- super("CLAIMED");
- }
-
- public void grantedBy(SystemAdmin admin, SystemPermission systemPermission) {
- if (!admin.equals(systemPermission.admin)) {
- return;
- }
- systemPermission.state = GRANTED;
- systemPermission.isGranted = true;
- systemPermission.notifyUserOfPermissionRequestResult();
- }
-
- public void deniedBy(SystemAdmin admin, SystemPermission systemPermission) {
- if (!admin.equals(systemPermission.admin)) {
- return;
- }
- systemPermission.isGranted = false;
- systemPermission.state = DENIED;
- systemPermission.notifyUserOfPermissionRequestResult();
- }
-
-}
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionDenied.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionDenied.java
deleted file mode 100644
index 098b5fac92273c2cf30e941a9e25887d281db5f5..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionDenied.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-class PermissionDenied extends PermissionState {
- public PermissionDenied() {
- super("DENIED");
- }
-
-}
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionGranted.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionGranted.java
deleted file mode 100644
index 5358d7c79c1ac7bf0900c3743af4fa2db4c550d7..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionGranted.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-class PermissionGranted extends PermissionState {
- public PermissionGranted() {
- super("GRANTED");
- }
-
-}
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionRequested.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionRequested.java
deleted file mode 100644
index 3d9d8c9e46a3720bf762743978970cd2be2e15c1..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionRequested.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-import fr.rtp.simplification.condwithstate.SystemAdmin;
-
-class PermissionRequested extends PermissionState {
- public PermissionRequested() {
- super("REQUESTED");
- }
-
- public void claimedBy(SystemAdmin admin, SystemPermission systemPermission) {
- systemPermission.willBeHandledBy(admin);
- systemPermission.state = CLAIMED;
- }
-}
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionState.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionState.java
deleted file mode 100644
index 4e2dec90fe1152e6c0387416f13e19b819a6c243..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/PermissionState.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-import fr.rtp.simplification.condwithstate.SystemAdmin;
-
-public abstract class PermissionState {
- private final String name;
-
- protected PermissionState(String name) {
- this.name = name;
- }
-
- public final static PermissionState REQUESTED = new PermissionRequested();
- public final static PermissionState CLAIMED = new PermissionClaimed();
- public final static PermissionState GRANTED = new PermissionGranted();
- public final static PermissionState DENIED = new PermissionDenied();
-
-
- @Override
- public String toString() {
- return name;
- }
-
- public void claimedBy(SystemAdmin admin, SystemPermission systemPermission) {
-
- }
-
- public void deniedBy(SystemAdmin admin, SystemPermission systemPermission) {
-
- }
-
- public void grantedBy(SystemAdmin admin, SystemPermission systemPermission) {
-
- }
-
-
-}
diff --git a/src/main/java/fr/rtp/simplification/condwithstate/refactored/SystemPermission.java b/src/main/java/fr/rtp/simplification/condwithstate/refactored/SystemPermission.java
deleted file mode 100755
index a67abbba374c40b504de5a98b78d75ec32680eb1..0000000000000000000000000000000000000000
--- a/src/main/java/fr/rtp/simplification/condwithstate/refactored/SystemPermission.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package fr.rtp.simplification.condwithstate.refactored;
-
-import fr.rtp.simplification.condwithstate.SystemAdmin;
-import fr.rtp.simplification.condwithstate.SystemProfile;
-import fr.rtp.simplification.condwithstate.SystemUser;
-
-/**
- * Chapter 7 - Simplification
- * Replace state-altering conditionals with state
- *
- * http://www.industriallogic.com/xp/refactoring/alteringConditionalsWithState.
- * html
- * http://www.informit.com/articles/article.aspx?p=1398607&seqNum=4
- */
-public class SystemPermission {
-
- private SystemProfile profile;
- private SystemUser requestor;
- protected SystemAdmin admin;
- protected boolean isGranted;
- protected PermissionState state;
-
-
- public SystemPermission(SystemUser requestor, SystemProfile profile) {
- this.requestor = requestor;
- this.profile = profile;
- state = PermissionState.REQUESTED;
- isGranted = false;
- notifyAdminOfPermissionRequest();
- }
-
- public void claimedBy(SystemAdmin admin) {
- this.state.claimedBy(admin, this);
- }
-
- public void deniedBy(SystemAdmin admin) {
- this.state.deniedBy(admin, this);
- }
-
- public void grantedBy(SystemAdmin admin) {
- this.state.grantedBy(admin, this);
- }
-
- protected void willBeHandledBy(SystemAdmin admin) {
- this.admin = admin;
- }
-
- protected void notifyUserOfPermissionRequestResult() {
- }
-
- private void notifyAdminOfPermissionRequest() {
- }
-
- public String state() {
- return state.toString();
- }
-
- public boolean isGranted() {
- return isGranted;
- }
-
-}