Moved code into new files
Merge pull request #12 from corebob/master

Moved code into new files