Changed Kodkod package architecture
import fixing