Fixed new package structure