fixed nesting of source files.