Moving files back out of the folder :-) to allow this to be pulled in as a git submodule