Updated to match the new directory structure