Update to 1.6.1-R0.1. Converting to maven build system