Move terms into a 'layer' directory. Updated several tests. Still not complete coverage, but getting closer.