move out immutable, change freebaseIds into Maps, minor changes
separate immutable