Globals removal part 2

remobe fno2fname global, replace with class