diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..524f096
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,24 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
diff --git a/bin/ATM.class b/bin/ATM.class
deleted file mode 100644
index 76543bf..0000000
Binary files a/bin/ATM.class and /dev/null differ
diff --git a/bin/ATMCaseStudy.class b/bin/ATMCaseStudy.class
deleted file mode 100644
index 607c10d..0000000
Binary files a/bin/ATMCaseStudy.class and /dev/null differ
diff --git a/bin/Account.class b/bin/Account.class
deleted file mode 100644
index 5d2d636..0000000
Binary files a/bin/Account.class and /dev/null differ
diff --git a/bin/BalanceInquiry.class b/bin/BalanceInquiry.class
deleted file mode 100644
index 48f8e6a..0000000
Binary files a/bin/BalanceInquiry.class and /dev/null differ
diff --git a/bin/BankDatabase.class b/bin/BankDatabase.class
deleted file mode 100644
index 429aec1..0000000
Binary files a/bin/BankDatabase.class and /dev/null differ
diff --git a/bin/CashDispenser.class b/bin/CashDispenser.class
deleted file mode 100644
index b8cedba..0000000
Binary files a/bin/CashDispenser.class and /dev/null differ
diff --git a/bin/Deposit.class b/bin/Deposit.class
deleted file mode 100644
index 57b0c3f..0000000
Binary files a/bin/Deposit.class and /dev/null differ
diff --git a/bin/DepositSlot.class b/bin/DepositSlot.class
deleted file mode 100644
index a2664ad..0000000
Binary files a/bin/DepositSlot.class and /dev/null differ
diff --git a/bin/Keypad.class b/bin/Keypad.class
deleted file mode 100644
index 9b066e2..0000000
Binary files a/bin/Keypad.class and /dev/null differ
diff --git a/bin/Screen.class b/bin/Screen.class
deleted file mode 100644
index a036758..0000000
Binary files a/bin/Screen.class and /dev/null differ
diff --git a/bin/Transaction.class b/bin/Transaction.class
deleted file mode 100644
index 1330b55..0000000
Binary files a/bin/Transaction.class and /dev/null differ
diff --git a/bin/Withdrawal.class b/bin/Withdrawal.class
deleted file mode 100644
index 291d645..0000000
Binary files a/bin/Withdrawal.class and /dev/null differ
diff --git a/componenti.txt b/componenti.txt
new file mode 100644
index 0000000..50a7c45
--- /dev/null
+++ b/componenti.txt
@@ -0,0 +1,3 @@
+Andrea Parisi 5202353
+Alessandro Borracino 5027310
+Giacomo Carena 5293937
\ No newline at end of file
diff --git a/src/Account.java b/src/code/Buisness_logic/Account.java
similarity index 80%
rename from src/Account.java
rename to src/code/Buisness_logic/Account.java
index c308eca..e6f965a 100644
--- a/src/Account.java
+++ b/src/code/Buisness_logic/Account.java
@@ -1,3 +1,4 @@
+package code.Buisness_logic;
 // Account.java
 // Represents a bank account
 
@@ -5,12 +6,12 @@ public class Account
 {
    private int accountNumber; // account number
    private int pin; // PIN for authentication
-   private double availableBalance; // funds available for withdrawal
-   private double totalBalance; // funds available + pending deposits
+   private Euro availableBalance; // funds available for withdrawal
+   private Euro totalBalance; // funds available + pending deposits
 
    // Account constructor initializes attributes
    public Account( int theAccountNumber, int thePIN, 
-      double theAvailableBalance, double theTotalBalance )
+      Euro theAvailableBalance, Euro theTotalBalance )
    {
       accountNumber = theAccountNumber;
       pin = thePIN;
@@ -28,28 +29,28 @@ public boolean validatePIN( int userPIN )
    } // end method validatePIN
    
    // returns available balance
-   public double getAvailableBalance()
+   public Euro getAvailableBalance()
    {
       return availableBalance;
    } // end getAvailableBalance
 
    // returns the total balance
-   public double getTotalBalance()
+   public Euro getTotalBalance()
    {
       return totalBalance;
    } // end method getTotalBalance
 
    // credits an amount to the account
-   public void credit( double amount )
+   public void credit( Euro amount )
    {
-      totalBalance += amount; // add to total balance
+      totalBalance.somma(amount); // add to total balance
    } // end method credit
 
    // debits an amount from the account
-   public void debit( double amount )
+   public void debit( Euro amount )
    {
-      availableBalance -= amount; // subtract from available balance
-      totalBalance -= amount; // subtract from total balance
+      availableBalance.sottrai(amount); // subtract from available balance
+      totalBalance.sottrai(amount); // subtract from total balance
    } // end method debit
 
    // returns account number
diff --git a/src/code/Buisness_logic/Euro.java b/src/code/Buisness_logic/Euro.java
new file mode 100644
index 0000000..7e95e86
--- /dev/null
+++ b/src/code/Buisness_logic/Euro.java
@@ -0,0 +1,49 @@
+package code.Buisness_logic;
+
+public class Euro {
+
+
+	private long valore;
+
+	public Euro(long euro, long cent) {
+		if (euro >= 0) {
+			valore = euro*100 + cent;
+		} else {
+			valore = euro*100 - cent;
+		}
+	}
+
+	public Euro(double d) {
+		valore = (long)(d*100);
+	}
+
+	public long getValore() {
+		return valore;
+	}
+
+	public Euro somma(Euro e) {
+		this.valore = this.valore + e.getValore();
+		return this;
+	}
+
+	public Euro sottrai(Euro e) {
+		this.valore = this.valore - e.getValore();
+		return this;
+	}
+
+	public boolean ugualeA(Euro e){
+		if (valore == e.getValore())
+			return true;
+		else return false;
+	}
+	
+	public boolean minoreDi(Euro e){
+		if (valore <= e.getValore())
+			return true;
+		else return false;
+	}
+
+	public String stampa(){
+		return (double)valore/100 +" euro";
+	}
+}
\ No newline at end of file
diff --git a/src/BankDatabase.java b/src/code/Database/BankDatabase.java
similarity index 86%
rename from src/BankDatabase.java
rename to src/code/Database/BankDatabase.java
index 3978497..8eedf03 100644
--- a/src/BankDatabase.java
+++ b/src/code/Database/BankDatabase.java
@@ -1,6 +1,10 @@
+package code.Database;
 // BankDatabase.java
 // Represents the bank account information database 
 
+import code.Buisness_logic.Account;
+import code.Buisness_logic.Euro;
+
 public class BankDatabase
 {
    private Account accounts[]; // array of Accounts
@@ -9,8 +13,8 @@ public class BankDatabase
    public BankDatabase()
    {
       accounts = new Account[ 2 ]; // just 2 accounts for testing
-      accounts[ 0 ] = new Account( 12345, 54321, 1000.0, 1200.0 );
-      accounts[ 1 ] = new Account( 98765, 56789, 200.0, 200.0 );  
+      accounts[ 0 ] = new Account( 12345, 54321, new Euro(1000), new Euro(1200) );
+      accounts[ 1 ] = new Account( 98765, 56789, new Euro(200), new Euro(200) );  
    } // end no-argument BankDatabase constructor
    
    // retrieve Account object containing specified account number
@@ -42,25 +46,25 @@ public boolean authenticateUser( int userAccountNumber, int userPIN )
    } // end method authenticateUser
 
    // return available balance of Account with specified account number
-   public double getAvailableBalance( int userAccountNumber )
+   public Euro getAvailableBalance( int userAccountNumber )
    {
       return getAccount( userAccountNumber ).getAvailableBalance();
    } // end method getAvailableBalance
 
    // return total balance of Account with specified account number
-   public double getTotalBalance( int userAccountNumber )
+   public Euro getTotalBalance( int userAccountNumber )
    {
       return getAccount( userAccountNumber ).getTotalBalance();
    } // end method getTotalBalance
 
    // credit an amount to Account with specified account number
-   public void credit( int userAccountNumber, double amount )
+   public void credit( int userAccountNumber, Euro amount )
    {
       getAccount( userAccountNumber ).credit( amount );
    } // end method credit
 
    // debit an amount from of Account with specified account number
-   public void debit( int userAccountNumber, double amount )
+   public void debit( int userAccountNumber, Euro amount )
    {
       getAccount( userAccountNumber ).debit( amount );
    } // end method debit
diff --git a/src/Transaction.java b/src/code/Database/Transaction.java
similarity index 97%
rename from src/Transaction.java
rename to src/code/Database/Transaction.java
index 508fea8..f1fe993 100644
--- a/src/Transaction.java
+++ b/src/code/Database/Transaction.java
@@ -1,6 +1,9 @@
+package code.Database;
 // Transaction.java
 // Abstract superclass Transaction represents an ATM transaction
 
+import code.GUI.Screen;
+
 public abstract class Transaction
 {
    private int accountNumber; // indicates account involved
diff --git a/src/ATM.java b/src/code/GUI/ATM.java
similarity index 98%
rename from src/ATM.java
rename to src/code/GUI/ATM.java
index aa3d187..244c47a 100644
--- a/src/ATM.java
+++ b/src/code/GUI/ATM.java
@@ -1,6 +1,10 @@
+package code.GUI;
 // ATM.java
 // Represents an automated teller machine
 
+import code.Database.BankDatabase;
+import code.Database.Transaction;
+
 public class ATM 
 {
    private boolean userAuthenticated; // whether user is authenticated
diff --git a/src/ATMCaseStudy.java b/src/code/GUI/ATMCaseStudy.java
similarity index 98%
rename from src/ATMCaseStudy.java
rename to src/code/GUI/ATMCaseStudy.java
index b9033bd..5beedde 100644
--- a/src/ATMCaseStudy.java
+++ b/src/code/GUI/ATMCaseStudy.java
@@ -1,3 +1,4 @@
+package code.GUI;
 // ATMCaseStudy.java
 // Driver program for the ATM case study
 
diff --git a/src/BalanceInquiry.java b/src/code/GUI/BalanceInquiry.java
similarity index 92%
rename from src/BalanceInquiry.java
rename to src/code/GUI/BalanceInquiry.java
index d45fa6a..026e9ac 100644
--- a/src/BalanceInquiry.java
+++ b/src/code/GUI/BalanceInquiry.java
@@ -1,6 +1,11 @@
+package code.GUI;
+import code.Buisness_logic.Euro;
 // BalanceInquiry.java
 // Represents a balance inquiry ATM transaction
 
+import code.Database.BankDatabase;
+import code.Database.Transaction;
+
 public class BalanceInquiry extends Transaction
 {
    // BalanceInquiry constructor
@@ -18,11 +23,11 @@ public void execute()
       Screen screen = getScreen();
 
       // get the available balance for the account involved
-      double availableBalance = 
+      Euro availableBalance = 
          bankDatabase.getAvailableBalance( getAccountNumber() );
 
       // get the total balance for the account involved
-      double totalBalance = 
+      Euro totalBalance = 
          bankDatabase.getTotalBalance( getAccountNumber() );
       
       // display the balance information on the screen
diff --git a/src/CashDispenser.java b/src/code/GUI/CashDispenser.java
similarity index 99%
rename from src/CashDispenser.java
rename to src/code/GUI/CashDispenser.java
index b249faf..d7dbef3 100644
--- a/src/CashDispenser.java
+++ b/src/code/GUI/CashDispenser.java
@@ -1,3 +1,5 @@
+package code.GUI;
+
 // CashDispenser.java
 // Represents the cash dispenser of the ATM
 
diff --git a/src/Deposit.java b/src/code/GUI/Deposit.java
similarity index 85%
rename from src/Deposit.java
rename to src/code/GUI/Deposit.java
index 916ef70..8aab3ce 100644
--- a/src/Deposit.java
+++ b/src/code/GUI/Deposit.java
@@ -1,9 +1,14 @@
+package code.GUI;
+import code.Buisness_logic.Euro;
 // Deposit.java
 // Represents a deposit ATM transaction
 
+import code.Database.BankDatabase;
+import code.Database.Transaction;
+
 public class Deposit extends Transaction
 {
-   private double amount; // amount to deposit
+   private Euro amount; // amount to deposit
    private Keypad keypad; // reference to keypad
    private DepositSlot depositSlot; // reference to deposit slot
    private final static int CANCELED = 0; // constant for cancel option
@@ -30,7 +35,7 @@ public void execute()
       amount = promptForDepositAmount(); // get deposit amount from user
 
       // check whether user entered a deposit amount or canceled
-      if ( amount != CANCELED )
+      if ( amount.getValore() != CANCELED )
       {
          // request deposit envelope containing specified amount
          screen.displayMessage( 
@@ -65,21 +70,28 @@ public void execute()
    } // end method execute
 
    // prompt user to enter a deposit amount in cents 
-   private double promptForDepositAmount()
+   private Euro promptForDepositAmount()
    {
       Screen screen = getScreen(); // get reference to screen
 
       // display the prompt
       screen.displayMessage( "\nPlease enter a deposit amount in " + 
          "CENTS (or 0 to cancel): " );
+
       int input = keypad.getInput(); // receive input of deposit amount
       
+      
       // check whether the user canceled or entered a valid amount
-      if ( input == CANCELED ) 
-         return CANCELED;
+      if ( input == 0 ) 
+         return new Euro(0); //CANCELED
       else
       {
-         return ( double ) input / 100; // return dollar amount 
+         return new Euro((long)Math.floor(input/100), input%100); 
+         /* abbiamo fatto in modo che si possa costruire un oggetto 
+         euro partendo da un long, abbiamo fatto il cast a long poichè
+         Math.floor resituisce un double ma siccome ci interessa la 
+         parte intera non dovrebbe essere un problema  */
+
       } // end else
    } // end method promptForDepositAmount
 } // end class Deposit
diff --git a/src/DepositSlot.java b/src/code/GUI/DepositSlot.java
similarity index 98%
rename from src/DepositSlot.java
rename to src/code/GUI/DepositSlot.java
index 64e02c2..bde0339 100644
--- a/src/DepositSlot.java
+++ b/src/code/GUI/DepositSlot.java
@@ -1,3 +1,4 @@
+package code.GUI;
 // DepositSlot.java
 // Represents the deposit slot of the ATM
 
diff --git a/src/Keypad.java b/src/code/GUI/Keypad.java
similarity index 98%
rename from src/Keypad.java
rename to src/code/GUI/Keypad.java
index cd035c7..f0f716c 100644
--- a/src/Keypad.java
+++ b/src/code/GUI/Keypad.java
@@ -1,3 +1,4 @@
+package code.GUI;
 // Keypad.java
 // Represents the keypad of the ATM
 import java.util.Scanner; // program uses Scanner to obtain user input
diff --git a/src/Screen.java b/src/code/GUI/Screen.java
similarity index 91%
rename from src/Screen.java
rename to src/code/GUI/Screen.java
index 44d3f30..65f0df4 100644
--- a/src/Screen.java
+++ b/src/code/GUI/Screen.java
@@ -1,3 +1,5 @@
+package code.GUI;
+import code.Buisness_logic.Euro;
 // Screen.java
 // Represents the screen of the ATM
 
@@ -16,9 +18,9 @@ public void displayMessageLine( String message )
    } // end method displayMessageLine
 
    // display a dollar amount
-   public void displayDollarAmount( double amount )
+   public void displayDollarAmount( Euro amount )
    {
-      System.out.printf( "$%,.2f", amount );   
+      System.out.printf( amount.stampa() );   
    } // end method displayDollarAmount 
 } // end class Screen
 
diff --git a/src/Withdrawal.java b/src/code/GUI/Withdrawal.java
similarity index 94%
rename from src/Withdrawal.java
rename to src/code/GUI/Withdrawal.java
index 6e0af62..2501227 100644
--- a/src/Withdrawal.java
+++ b/src/code/GUI/Withdrawal.java
@@ -1,6 +1,11 @@
+package code.GUI;
+import code.Buisness_logic.Euro;
 // Withdrawal.java
 // Represents a withdrawal ATM transaction
 
+import code.Database.BankDatabase;
+import code.Database.Transaction;
+
 public class Withdrawal extends Transaction
 {
    private int amount; // amount to withdraw
@@ -27,7 +32,7 @@ public Withdrawal( int userAccountNumber, Screen atmScreen,
    public void execute()
    {
       boolean cashDispensed = false; // cash was not dispensed yet
-      double availableBalance; // amount available for withdrawal
+      Euro availableBalance; // amount available for withdrawal
 
       // get references to bank database and screen
       BankDatabase bankDatabase = getBankDatabase(); 
@@ -45,15 +50,16 @@ public void execute()
             // get available balance of account involved
             availableBalance = 
                bankDatabase.getAvailableBalance( getAccountNumber() );
-      
+            
+            Euro euroAmount = new Euro(amount);
             // check whether the user has enough money in the account 
-            if ( amount <= availableBalance )
+            if ( euroAmount.minoreDi(availableBalance) )
             {   
                // check whether the cash dispenser has enough money
                if ( cashDispenser.isSufficientCashAvailable( amount ) )
                {
                   // update the account involved to reflect withdrawal
-                  bankDatabase.debit( getAccountNumber(), amount );
+                  bankDatabase.debit( getAccountNumber(), euroAmount );
                   
                   cashDispenser.dispenseCash( amount ); // dispense cash
                   cashDispensed = true; // cash was dispensed