Moved packages to conform to maven groupid. Thanks IntelliJ!