fully converted to working maven project with latest updates