Finished (crude) Namespacing of code.