Redone to maven project