Fixed GitHub hickup..

Had to revert local copy due to github deciding all the files were not
needed anymore... fixed and removed a couple of files no longer in use.