changed package directory names to match corex...