Conform to proper class namespace/structuring standards