Organized code

-------------------
2014-01-17 : v0.4.2
-------------------
* Changed: Organized library a little better