Namespace Adjustments

Adjusted Namespaces and folder names so they make more sense.