Move to traditional package structure.