Updated for dir restructure