adopted project structure to maven