Moving to maven project structure