Moved data files to data directory. Moved test and util files to test directory
Must modify code to adapt! (still not done!!!)