Refactor stuff out of 'need'
Directory read requires contained targets to build