More reorganization of the main package