fixed package declarations and removed unused imports