Merged states and functions together into the same file

no more blahStates.fs and blahFunctions.fs; just blah.fs