Changing class naming convention to be PSR-0 compliant