Changed some namespacing and migrations