Restructure project and get maven build order right.