Refactored package structure to multi-module project.