Convert project to Maven
maven working
fixed merge conflicts