Fixes organization to match the OSS repository