Updated to use PSR-0 auto includes