Updated to be able to use lazy controllers/services/etc on bootstrap. Also means we can do away with wrapping the controller files with 'define'