Also refactored some of the import names, as they were pointless. Signed-off-by: Dave Shanley <dave@quobix.com>