Refactored the app to include java. Also refactored the package naming and unit tests.