reorganizing source code files