more reorganization, and some more packages