Cleaned up namespaces.
Changed static/access modifier order.
Refactored DocBlocks.
Merge pull request #6 from pedzed/master

Codebase cleanup