in addition to fixing controller resolve, re-orged structrure
Merge pull request #3 from sonjayatandon/fix-controller-resolve

in addition to fixing controller resolve, re-orged structrure