refactored how classes are included from irf namespace