refactor mvn file structure