Factored out StateT MonadPlus typeclass

Also finished makeFStructure function
Tidied up TODOs