Ok, with this commit I believe I have reverted all the files to contain their history and re-added any changes made after the revert. If anyone sees any issues point them out. :)