Small directory cleanup/changing fixes.  Added extra tests, comments.

Made test files match test procedure.