Since the branch is already 1.5.3.x to 1.5.4.x, extract OC folder to the root