- restructured source files