checkpoint for mavenizing
merge some maven changes
switch to maven