Added support core, renamed packages to match