Refeactored directories