Added package. Refactored classes. Added Inner class test.