removed a TON of junk, refactored namespaces