Changing structure to maven standard