Update to match new framework directory structure and environment variables