Revert modified classes to original state, as multiple namespace is implemented in the new packages anyway.