Move code to repo root
Merge pull request #1 from flynn/simplify

Move code to repo root