Changes on the Maven structure