Fix package structure.