moved Echo source files to correct location