So, merging through the github client was not as well handled as hoped. Removed important files.
Re-added desired files.