Re-factored some of the storage classes to a separate name space and added new CodeUnit statements.