Updated for new directories structure