Reorganize source on different files