Refactored classes into main package. Added test package with 12 unit tests.