move class file into src part 2