Reverted main folder to 1.36 and placed 1.38 in a separate folder