restructured to maven project