Added company mode, moved some paths around