Move definitions to a proper place.