Reorganized file structure a bit. Also committed test data for matlab.