Placed all relevant code into lib folder
Merge pull request #4 from TheEskhaton/dev

Placed all relevant code into lib folder