Further code reorganization.