Merge "Move the implementation of cd entry map to a separate file"