reorganize the structure of source directories