Moving stuff around.
Merge pull request #8 from p32424/master

Moving stuff around.