Reorganizing source code