Added modified files and Calculator tests

Modified files to fit with the new API.
Added Calculator classes to the test package.
Added new AsyncCallback interface to deal with asynchronous calls.
Headers updated

Updated all header in .java files