Adding GA code and supporting subfolders