refactor to maven standard structure