Fixed the package structure to remove duplicates of "core" everywhere.