Work on cleaning up package structure and further work on ObjectMother