Added directory structure as per issue #2 recommendation