Moved built-in extensions into categories
Added support for extensions in categories