code structure and file renaming
added test, corrected class names in coder pair