Re-organised directory structure
Updated syntax in PHP classes