Change in extension files and organization