Try to add psr-0 compliance