Moved stuff around
Merge pull request #4 from Zordox/master

Moved stuff around