Restructured source files