in addition to fixing controller resolve, re-orged structrure