Refactoring to separate PHP code. Other languages may follow.