moving more things around
Merge pull request #86 from mirleft/more-moving

moving more things around