Reordered miscellaneous and depreciated modules