Refactored all class packages for Beta