2) $GLOBALS['phpgw{_info}'] ==> $GLOBALS['egw{_info}'] 3) moved setup-classes from phpgwapi/inc back to setup/inc (they are not used anywhere else, but in setup)