Combined classes to one include file

minor DRY cleanup