Reorganize source directories