Reorganization of source files