Push before code reorganization