Steve: rework to maven project structure
Steve: rework to maven project structure