Refactor out extra directories