Nuking the whole thing to start over,

namespaces are wrong, structure was wrong.