partial resolution of issues #4 and #20, and refactored test and exa directories