WaResource partial refactoring. First step.