refactoring: make the package/folder more graceful
refactoring: fix some the 'package' info
refactoring: make my JUnit test more readable