proper version, maven reorganization