Refactored package names to fit new project name. Better to refactor now
before I have an external application dependent on this library.