Refactored classes. Moved to new package. (no longer in default package)