Hey, why use long complicated names when we have namespaces! Restruturing