Renaming, moving to namespaces, redesigning