Renamed files, added assert for joint count