reorganize source