Moving stuff around
Merge pull request #6 from clemtine/branch-chris

Moving stuff around