Miscellaneous updates
Reorganized extensions