Recompiled
More namespacing and stuff