Putting both implementations in folders

Getting git to merge a new project with an old one is a pain in the ass, I tell you what.