restructured source files