Cleaned Up.

Weird directory errors forced me to clean it all up.