Refactor - moved classes to packages.