Changed package structure (John K, Sam N).