Miscellaneous reorganization