Moved class into folder matching namespace for autoloading
Fixed template folder location