Improved package structure and removed unused imports