Reorganize source tree to match module layout