restructured srm operations

tested with tstorm-tests: all passed