Incorporating Tatsuo's suggestion on new directory structure.