Refactored to create packages. Enabled the first unit test.