Moved classes into correct namespaces.

Classes were in folders but the namespaces they were in were not
correctly reflecting the folders. Now that is fixed.