phpClass refactoring, in progress