Moving reference types in the same package and subsequent refactoring.