SDK Migration: Reorganizing addon files #8