don_'t need virtual
remove debug output
Re-organizing code/files part 1
Re-organizing code/files part 2