Reorganize source