Fixed order structs for all subject. Another major commit of TC code refactoring.