Reorganization of program functionality