moves stuff around
Merge pull request #9 from balauru/move

moves stuff around