Comments added.
Test directory renamed.