Incorporated Nigel's comments.   Fixed package structure