brought project structure into maven conformance