Initial Import
Fixed some maven issues