Converted to maven project - part2