Refactored - moved a couple of classes to simplify package structure.