Reorganization in several files