LR-1: Reorganized files. Started writing tests.
Merge branch 'jim-branch'