Added ruleset, state descriptors moved to separate files