Added license
Ditched all traces of namespaces, cleaned up