Change to original package structure.