Refactored packages location
Also removed unused classes