merged two-file extensions into a single file to avoid loading issues