Moving back from ST to StateP
Merge pull request #3 from k0001/back-to-statep

Moving back from ST to StateP