Updated so to fit new directory structure