adding source files according to initial class layout