Fix packaging issue due to recent refactor of poms