Move files around
Merge pull request #1 from rubenwardy/master

Move files around