refactor layout of source code files