REFACTOR: Moved to multi-module maven