Moving RawSystem and refactoring code.