Modified source tree structure and source file names