Some refactoring. Planning to move RCP client initialization away and allow user to control it.