Starting to refactor into files, add test data