First pass to make controller parsing stateful
map methods to filenames
Merge branch 'fix-one-to-one-assumption'

Process controllers defined in multiple files