Moving to standard mvn setup