made minor modification to package structure.