refactoring to namespaces & PSR-0
Merge remote-tracking branch 'origin/master'