Added Main and Test pkgs.  All JUnit tests now in Test Package.