initial cleanup and conversion to collada package