Possibly final major package reorganization