changed structure of source files