Add new directory structure handler
Add env vars to enable automated builds