Move sample data to new directory
Merge branch 'master' into server-refactor