refactor source files in folders