Move fixture files into app dir
Merge branch 'fixtures_move'