Finished i buggy calc.java
Removed calc.java to be in another package