Changed project structure to allow complete maven build