Reformatted package structure. Updated test script based on new format.