diff --git a/.DS_Store b/.DS_Store
index 3236b4a97698eea5ca9a3c1cf366229fd13679b5..9f886383c7b0432c8d0bcede35464dc0cb215642 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Assignment4.0/Monopoly/.idea/misc.xml b/Monopoly/.idea/misc.xml
similarity index 100%
rename from Assignment4.0/Monopoly/.idea/misc.xml
rename to Monopoly/.idea/misc.xml
diff --git a/Assignment4.0/Monopoly/.idea/modules.xml b/Monopoly/.idea/modules.xml
similarity index 100%
rename from Assignment4.0/Monopoly/.idea/modules.xml
rename to Monopoly/.idea/modules.xml
diff --git a/Assignment4.0/Monopoly/.idea/uiDesigner.xml b/Monopoly/.idea/uiDesigner.xml
similarity index 100%
rename from Assignment4.0/Monopoly/.idea/uiDesigner.xml
rename to Monopoly/.idea/uiDesigner.xml
diff --git a/Assignment4.0/Monopoly/.idea/workspace.xml b/Monopoly/.idea/workspace.xml
similarity index 100%
rename from Assignment4.0/Monopoly/.idea/workspace.xml
rename to Monopoly/.idea/workspace.xml
diff --git a/Assignment4.0/Monopoly/Monopoly.iml b/Monopoly/Monopoly.iml
similarity index 100%
rename from Assignment4.0/Monopoly/Monopoly.iml
rename to Monopoly/Monopoly.iml
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Chance.class b/Monopoly/out/production/Monopoly/Board/Chance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Chance.class
rename to Monopoly/out/production/Monopoly/Board/Chance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/CommunityChest.class b/Monopoly/out/production/Monopoly/Board/CommunityChest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/CommunityChest.class
rename to Monopoly/out/production/Monopoly/Board/CommunityChest.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/FreeParking.class b/Monopoly/out/production/Monopoly/Board/FreeParking.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/FreeParking.class
rename to Monopoly/out/production/Monopoly/Board/FreeParking.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Go.class b/Monopoly/out/production/Monopoly/Board/Go.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Go.class
rename to Monopoly/out/production/Monopoly/Board/Go.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/GoToJail.class b/Monopoly/out/production/Monopoly/Board/GoToJail.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/GoToJail.class
rename to Monopoly/out/production/Monopoly/Board/GoToJail.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Jail.class b/Monopoly/out/production/Monopoly/Board/Jail.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Jail.class
rename to Monopoly/out/production/Monopoly/Board/Jail.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/MonopolyBoard.class b/Monopoly/out/production/Monopoly/Board/MonopolyBoard.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/MonopolyBoard.class
rename to Monopoly/out/production/Monopoly/Board/MonopolyBoard.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/PassingJail.class b/Monopoly/out/production/Monopoly/Board/PassingJail.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/PassingJail.class
rename to Monopoly/out/production/Monopoly/Board/PassingJail.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Property.class b/Monopoly/out/production/Monopoly/Board/Property.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Property.class
rename to Monopoly/out/production/Monopoly/Board/Property.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Railroad.class b/Monopoly/out/production/Monopoly/Board/Railroad.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Railroad.class
rename to Monopoly/out/production/Monopoly/Board/Railroad.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Space.class b/Monopoly/out/production/Monopoly/Board/Space.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Space.class
rename to Monopoly/out/production/Monopoly/Board/Space.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Tax.class b/Monopoly/out/production/Monopoly/Board/Tax.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Tax.class
rename to Monopoly/out/production/Monopoly/Board/Tax.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Board/Utilities.class b/Monopoly/out/production/Monopoly/Board/Utilities.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Board/Utilities.class
rename to Monopoly/out/production/Monopoly/Board/Utilities.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Main.class b/Monopoly/out/production/Monopoly/Main.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Main.class
rename to Monopoly/out/production/Monopoly/Main.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToGoChance.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToGoChance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToGoChance.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToGoChance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToIllinois.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToIllinois.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToIllinois.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToIllinois.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToRailRoad.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToRailRoad.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToRailRoad.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToRailRoad.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToStCharles.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToStCharles.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToStCharles.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToStCharles.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToUtility.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToUtility.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToUtility.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/AdvanceToUtility.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/BankPaysYou.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/BankPaysYou.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/BankPaysYou.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/BankPaysYou.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/ChanceCard.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/ChanceCard.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/ChanceCard.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/ChanceCard.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GetOutOfJailChance.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GetOutOfJailChance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GetOutOfJailChance.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/GetOutOfJailChance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoBackThree.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoBackThree.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoBackThree.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoBackThree.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoToJailChance.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoToJailChance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoToJailChance.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/GoToJailChance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/MakeGeneralRepairs.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/MakeGeneralRepairs.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/MakeGeneralRepairs.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/MakeGeneralRepairs.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/PayPoorTax.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/PayPoorTax.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/PayPoorTax.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/PayPoorTax.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeTripToReading.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeTripToReading.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeTripToReading.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeTripToReading.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeWalkOnBoardwalk.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeWalkOnBoardwalk.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeWalkOnBoardwalk.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/TakeWalkOnBoardwalk.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YouAreChairman.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YouAreChairman.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YouAreChairman.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/YouAreChairman.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YourBuildingLoanMatures.class b/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YourBuildingLoanMatures.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/ChanceCards/YourBuildingLoanMatures.class
rename to Monopoly/out/production/Monopoly/Pieces/ChanceCards/YourBuildingLoanMatures.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/AdvanceToGoCC.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/AdvanceToGoCC.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/AdvanceToGoCC.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/AdvanceToGoCC.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/BankError.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/BankError.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/BankError.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/BankError.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/CommunityChestCard.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/CommunityChestCard.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/CommunityChestCard.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/CommunityChestCard.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/DoctorFees.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/DoctorFees.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/DoctorFees.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/DoctorFees.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/FromStockSale.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/FromStockSale.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/FromStockSale.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/FromStockSale.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GetOutOfJailCC.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GetOutOfJailCC.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GetOutOfJailCC.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GetOutOfJailCC.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GoToJailCC.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GoToJailCC.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GoToJailCC.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GoToJailCC.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GrandOpera.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GrandOpera.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GrandOpera.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/GrandOpera.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/HolidayFund.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/HolidayFund.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/HolidayFund.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/HolidayFund.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/IncomeTaxRefund.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/IncomeTaxRefund.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/IncomeTaxRefund.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/IncomeTaxRefund.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/LifeInsurance.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/LifeInsurance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/LifeInsurance.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/LifeInsurance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PayHospital.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PayHospital.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PayHospital.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PayHospital.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PaySchool.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PaySchool.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PaySchool.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/PaySchool.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/ReceiveConsultantFee.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/ReceiveConsultantFee.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/ReceiveConsultantFee.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/ReceiveConsultantFee.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouGetStreetRepairs.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouGetStreetRepairs.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouGetStreetRepairs.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouGetStreetRepairs.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouReceivedInheitance.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouReceivedInheitance.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouReceivedInheitance.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouReceivedInheitance.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouWonBeauty.class b/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouWonBeauty.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouWonBeauty.class
rename to Monopoly/out/production/Monopoly/Pieces/CommunityChestCards/YouWonBeauty.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/Dice.class b/Monopoly/out/production/Monopoly/Pieces/Dice.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/Dice.class
rename to Monopoly/out/production/Monopoly/Pieces/Dice.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Pieces/PlayerPiece.class b/Monopoly/out/production/Monopoly/Pieces/PlayerPiece.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Pieces/PlayerPiece.class
rename to Monopoly/out/production/Monopoly/Pieces/PlayerPiece.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Players/Bank.class b/Monopoly/out/production/Monopoly/Players/Bank.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Players/Bank.class
rename to Monopoly/out/production/Monopoly/Players/Bank.class
diff --git a/Assignment4.0/Monopoly/out/production/Monopoly/Players/Player.class b/Monopoly/out/production/Monopoly/Players/Player.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/production/Monopoly/Players/Player.class
rename to Monopoly/out/production/Monopoly/Players/Player.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/AllTest.class b/Monopoly/out/test/Monopoly/AllTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/AllTest.class
rename to Monopoly/out/test/Monopoly/AllTest.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/Board/ChanceTest.class b/Monopoly/out/test/Monopoly/Board/ChanceTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/Board/ChanceTest.class
rename to Monopoly/out/test/Monopoly/Board/ChanceTest.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/Board/CommunityChestTest.class b/Monopoly/out/test/Monopoly/Board/CommunityChestTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/Board/CommunityChestTest.class
rename to Monopoly/out/test/Monopoly/Board/CommunityChestTest.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/Board/FreeParkingTest.class b/Monopoly/out/test/Monopoly/Board/FreeParkingTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/Board/FreeParkingTest.class
rename to Monopoly/out/test/Monopoly/Board/FreeParkingTest.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/Board/GoTest.class b/Monopoly/out/test/Monopoly/Board/GoTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/Board/GoTest.class
rename to Monopoly/out/test/Monopoly/Board/GoTest.class
diff --git a/Assignment4.0/Monopoly/out/test/Monopoly/Board/GoToJailTest.class b/Monopoly/out/test/Monopoly/Board/GoToJailTest.class
similarity index 100%
rename from Assignment4.0/Monopoly/out/test/Monopoly/Board/GoToJailTest.class
rename to Monopoly/out/test/Monopoly/Board/GoToJailTest.class
diff --git a/Assignment4.0/Monopoly/src/Board/Chance.java b/Monopoly/src/Board/Chance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Chance.java
rename to Monopoly/src/Board/Chance.java
diff --git a/Assignment4.0/Monopoly/src/Board/CommunityChest.java b/Monopoly/src/Board/CommunityChest.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/CommunityChest.java
rename to Monopoly/src/Board/CommunityChest.java
diff --git a/Assignment4.0/Monopoly/src/Board/FreeParking.java b/Monopoly/src/Board/FreeParking.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/FreeParking.java
rename to Monopoly/src/Board/FreeParking.java
diff --git a/Assignment4.0/Monopoly/src/Board/Go.java b/Monopoly/src/Board/Go.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Go.java
rename to Monopoly/src/Board/Go.java
diff --git a/Assignment4.0/Monopoly/src/Board/GoToJail.java b/Monopoly/src/Board/GoToJail.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/GoToJail.java
rename to Monopoly/src/Board/GoToJail.java
diff --git a/Assignment4.0/Monopoly/src/Board/Jail.java b/Monopoly/src/Board/Jail.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Jail.java
rename to Monopoly/src/Board/Jail.java
diff --git a/Assignment4.0/Monopoly/src/Board/MonopolyBoard.java b/Monopoly/src/Board/MonopolyBoard.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/MonopolyBoard.java
rename to Monopoly/src/Board/MonopolyBoard.java
diff --git a/Assignment4.0/Monopoly/src/Board/PassingJail.java b/Monopoly/src/Board/PassingJail.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/PassingJail.java
rename to Monopoly/src/Board/PassingJail.java
diff --git a/Assignment4.0/Monopoly/src/Board/Property.java b/Monopoly/src/Board/Property.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Property.java
rename to Monopoly/src/Board/Property.java
diff --git a/Assignment4.0/Monopoly/src/Board/Railroad.java b/Monopoly/src/Board/Railroad.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Railroad.java
rename to Monopoly/src/Board/Railroad.java
diff --git a/Assignment4.0/Monopoly/src/Board/Space.java b/Monopoly/src/Board/Space.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Space.java
rename to Monopoly/src/Board/Space.java
diff --git a/Assignment4.0/Monopoly/src/Board/Tax.java b/Monopoly/src/Board/Tax.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Tax.java
rename to Monopoly/src/Board/Tax.java
diff --git a/Assignment4.0/Monopoly/src/Board/Utilities.java b/Monopoly/src/Board/Utilities.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Board/Utilities.java
rename to Monopoly/src/Board/Utilities.java
diff --git a/Assignment4.0/Monopoly/src/Main.java b/Monopoly/src/Main.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Main.java
rename to Monopoly/src/Main.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToGoChance.java b/Monopoly/src/Pieces/ChanceCards/AdvanceToGoChance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToGoChance.java
rename to Monopoly/src/Pieces/ChanceCards/AdvanceToGoChance.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToIllinois.java b/Monopoly/src/Pieces/ChanceCards/AdvanceToIllinois.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToIllinois.java
rename to Monopoly/src/Pieces/ChanceCards/AdvanceToIllinois.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToRailRoad.java b/Monopoly/src/Pieces/ChanceCards/AdvanceToRailRoad.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToRailRoad.java
rename to Monopoly/src/Pieces/ChanceCards/AdvanceToRailRoad.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToStCharles.java b/Monopoly/src/Pieces/ChanceCards/AdvanceToStCharles.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToStCharles.java
rename to Monopoly/src/Pieces/ChanceCards/AdvanceToStCharles.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToUtility.java b/Monopoly/src/Pieces/ChanceCards/AdvanceToUtility.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/AdvanceToUtility.java
rename to Monopoly/src/Pieces/ChanceCards/AdvanceToUtility.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/BankPaysYou.java b/Monopoly/src/Pieces/ChanceCards/BankPaysYou.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/BankPaysYou.java
rename to Monopoly/src/Pieces/ChanceCards/BankPaysYou.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/ChanceCard.java b/Monopoly/src/Pieces/ChanceCards/ChanceCard.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/ChanceCard.java
rename to Monopoly/src/Pieces/ChanceCards/ChanceCard.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/GetOutOfJailChance.java b/Monopoly/src/Pieces/ChanceCards/GetOutOfJailChance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/GetOutOfJailChance.java
rename to Monopoly/src/Pieces/ChanceCards/GetOutOfJailChance.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/GoBackThree.java b/Monopoly/src/Pieces/ChanceCards/GoBackThree.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/GoBackThree.java
rename to Monopoly/src/Pieces/ChanceCards/GoBackThree.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/GoToJailChance.java b/Monopoly/src/Pieces/ChanceCards/GoToJailChance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/GoToJailChance.java
rename to Monopoly/src/Pieces/ChanceCards/GoToJailChance.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/MakeGeneralRepairs.java b/Monopoly/src/Pieces/ChanceCards/MakeGeneralRepairs.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/MakeGeneralRepairs.java
rename to Monopoly/src/Pieces/ChanceCards/MakeGeneralRepairs.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/PayPoorTax.java b/Monopoly/src/Pieces/ChanceCards/PayPoorTax.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/PayPoorTax.java
rename to Monopoly/src/Pieces/ChanceCards/PayPoorTax.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/TakeTripToReading.java b/Monopoly/src/Pieces/ChanceCards/TakeTripToReading.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/TakeTripToReading.java
rename to Monopoly/src/Pieces/ChanceCards/TakeTripToReading.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/TakeWalkOnBoardwalk.java b/Monopoly/src/Pieces/ChanceCards/TakeWalkOnBoardwalk.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/TakeWalkOnBoardwalk.java
rename to Monopoly/src/Pieces/ChanceCards/TakeWalkOnBoardwalk.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/YouAreChairman.java b/Monopoly/src/Pieces/ChanceCards/YouAreChairman.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/YouAreChairman.java
rename to Monopoly/src/Pieces/ChanceCards/YouAreChairman.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/ChanceCards/YourBuildingLoanMatures.java b/Monopoly/src/Pieces/ChanceCards/YourBuildingLoanMatures.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/ChanceCards/YourBuildingLoanMatures.java
rename to Monopoly/src/Pieces/ChanceCards/YourBuildingLoanMatures.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/AdvanceToGoCC.java b/Monopoly/src/Pieces/CommunityChestCards/AdvanceToGoCC.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/AdvanceToGoCC.java
rename to Monopoly/src/Pieces/CommunityChestCards/AdvanceToGoCC.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/BankError.java b/Monopoly/src/Pieces/CommunityChestCards/BankError.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/BankError.java
rename to Monopoly/src/Pieces/CommunityChestCards/BankError.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/CommunityChestCard.java b/Monopoly/src/Pieces/CommunityChestCards/CommunityChestCard.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/CommunityChestCard.java
rename to Monopoly/src/Pieces/CommunityChestCards/CommunityChestCard.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/DoctorFees.java b/Monopoly/src/Pieces/CommunityChestCards/DoctorFees.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/DoctorFees.java
rename to Monopoly/src/Pieces/CommunityChestCards/DoctorFees.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/FromStockSale.java b/Monopoly/src/Pieces/CommunityChestCards/FromStockSale.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/FromStockSale.java
rename to Monopoly/src/Pieces/CommunityChestCards/FromStockSale.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GetOutOfJailCC.java b/Monopoly/src/Pieces/CommunityChestCards/GetOutOfJailCC.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GetOutOfJailCC.java
rename to Monopoly/src/Pieces/CommunityChestCards/GetOutOfJailCC.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GoToJailCC.java b/Monopoly/src/Pieces/CommunityChestCards/GoToJailCC.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GoToJailCC.java
rename to Monopoly/src/Pieces/CommunityChestCards/GoToJailCC.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GrandOpera.java b/Monopoly/src/Pieces/CommunityChestCards/GrandOpera.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/GrandOpera.java
rename to Monopoly/src/Pieces/CommunityChestCards/GrandOpera.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/HolidayFund.java b/Monopoly/src/Pieces/CommunityChestCards/HolidayFund.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/HolidayFund.java
rename to Monopoly/src/Pieces/CommunityChestCards/HolidayFund.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/IncomeTaxRefund.java b/Monopoly/src/Pieces/CommunityChestCards/IncomeTaxRefund.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/IncomeTaxRefund.java
rename to Monopoly/src/Pieces/CommunityChestCards/IncomeTaxRefund.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/LifeInsurance.java b/Monopoly/src/Pieces/CommunityChestCards/LifeInsurance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/LifeInsurance.java
rename to Monopoly/src/Pieces/CommunityChestCards/LifeInsurance.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/PayHospital.java b/Monopoly/src/Pieces/CommunityChestCards/PayHospital.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/PayHospital.java
rename to Monopoly/src/Pieces/CommunityChestCards/PayHospital.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/PaySchool.java b/Monopoly/src/Pieces/CommunityChestCards/PaySchool.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/PaySchool.java
rename to Monopoly/src/Pieces/CommunityChestCards/PaySchool.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/ReceiveConsultantFee.java b/Monopoly/src/Pieces/CommunityChestCards/ReceiveConsultantFee.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/ReceiveConsultantFee.java
rename to Monopoly/src/Pieces/CommunityChestCards/ReceiveConsultantFee.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouGetStreetRepairs.java b/Monopoly/src/Pieces/CommunityChestCards/YouGetStreetRepairs.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouGetStreetRepairs.java
rename to Monopoly/src/Pieces/CommunityChestCards/YouGetStreetRepairs.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouReceivedInheitance.java b/Monopoly/src/Pieces/CommunityChestCards/YouReceivedInheitance.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouReceivedInheitance.java
rename to Monopoly/src/Pieces/CommunityChestCards/YouReceivedInheitance.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouWonBeauty.java b/Monopoly/src/Pieces/CommunityChestCards/YouWonBeauty.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/CommunityChestCards/YouWonBeauty.java
rename to Monopoly/src/Pieces/CommunityChestCards/YouWonBeauty.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/Dice.java b/Monopoly/src/Pieces/Dice.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/Dice.java
rename to Monopoly/src/Pieces/Dice.java
diff --git a/Assignment4.0/Monopoly/src/Pieces/PlayerPiece.java b/Monopoly/src/Pieces/PlayerPiece.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Pieces/PlayerPiece.java
rename to Monopoly/src/Pieces/PlayerPiece.java
diff --git a/Assignment4.0/Monopoly/src/Players/Bank.java b/Monopoly/src/Players/Bank.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Players/Bank.java
rename to Monopoly/src/Players/Bank.java
diff --git a/Assignment4.0/Monopoly/src/Players/Player.java b/Monopoly/src/Players/Player.java
similarity index 100%
rename from Assignment4.0/Monopoly/src/Players/Player.java
rename to Monopoly/src/Players/Player.java
diff --git a/Assignment4.0/Monopoly/test/AllTest.java b/Monopoly/test/AllTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/AllTest.java
rename to Monopoly/test/AllTest.java
diff --git a/Assignment4.0/Monopoly/test/Board/ChanceTest.java b/Monopoly/test/Board/ChanceTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/Board/ChanceTest.java
rename to Monopoly/test/Board/ChanceTest.java
diff --git a/Assignment4.0/Monopoly/test/Board/CommunityChestTest.java b/Monopoly/test/Board/CommunityChestTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/Board/CommunityChestTest.java
rename to Monopoly/test/Board/CommunityChestTest.java
diff --git a/Assignment4.0/Monopoly/test/Board/FreeParkingTest.java b/Monopoly/test/Board/FreeParkingTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/Board/FreeParkingTest.java
rename to Monopoly/test/Board/FreeParkingTest.java
diff --git a/Assignment4.0/Monopoly/test/Board/GoTest.java b/Monopoly/test/Board/GoTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/Board/GoTest.java
rename to Monopoly/test/Board/GoTest.java
diff --git a/Assignment4.0/Monopoly/test/Board/GoToJailTest.java b/Monopoly/test/Board/GoToJailTest.java
similarity index 100%
rename from Assignment4.0/Monopoly/test/Board/GoToJailTest.java
rename to Monopoly/test/Board/GoToJailTest.java
diff --git a/Assignment4.0/Week1Rubric.txt b/Week1Rubric.txt
similarity index 100%
rename from Assignment4.0/Week1Rubric.txt
rename to Week1Rubric.txt