reorganized structure to maven project