More file organization and a test script