Refactored moving most classes into a package.