Removed and merged a ton of redundant files.