Reorganizing; adding basic test script.