rename class file to take advantage of autoloading
Adding autoload fix, cleaning comments, merging classname fix