Reorganize source structure