LS: refactored directory structure.
LS: Made suggested updates by Graham Inggs