Reorganized classes into different packages
Deleted Test.java