reorganization of code among packages