tidying up require paths/shims