getting ready to rename classes and create namespaces