Finished renaming, Started implementing quiz

Adjusted namespaces