Feature maven restructure

Fixes maven files when using as a submodule