Changed namespace mapping to be PSR-0 compliant + move class file