Reorganization of code location