Mavenized project
Complete maven conversion
Resolve conflict