Renamed packages, fixed bug, removed unused imports