Refactored the package structure.