Properly pull files into top level types.
Merge branch 'master' of github.com:Grundlefleck/ci-eye-plugin-poc into HEAD