Fixed a screw up with last few commits

Made a mistake and accidentally reverted too far back plus included
unnecessary files. Fixed this.