Improve file structure and set up test

However, I am not sure how to write the tests yet, so it's not testing for anything useful.