Second code reorganization