Refactored, and improved support for PHP Classes.