Refactored package, and removed unused classes