Reorganization of code.