Reorganized things; got rid of those silly type namespaces and just put all those functions/methods in the types they belong to.