towards structure fixes around Direct vs System classes