Deleted duplicate classes and refactored code to import from appropriate package