Complete naming restructure. I really like this better.