Mazen Maven Update ;)

Mavenised everything