Move data_dir to its own file
Review structure of fixtures
Update gemspec