restructured files, added test data set