Update to maven layout