LR-1: Reorganized files. Started writing tests.