Moved all classes to extension.php