Changed some namespaces, set up some structural things