From OGSI to WSRF: Refactoring & Evolution