Reorganize source files