Rationalize method and filenames, move to subdirectory.
Respond to comments