Refactor: Adjust package structure.