Reorganization of code folders