Refactoring of spike

Bunch of files became something different to what they were originally
intended and these have been renamed and moved.  Seem to be in a
slightly better place now