Updated to match new directory structure