Merging

Removed packages folder.
Relocated the junit packages to test folder.
Placed JUnit test class in test folder