REorganized core.models