Refactored package names and classes