Changed class namespacing

Ok, so I also made a whitespace change.  And a couple of comments. And
removed template directory attribute.  But that is all.