- Fixed bugs found by "FindBugs"
- Added builder for tests data structures
- Moved main program files into "main" package
- Comments added