Migrated to maven project, service restructure, amoung other things