Updated for new folder layout (but not fully tested yet).
1 file changed