Structure change.

Added core back.