directory organization and we now use less
Merge branch 'web-dev' of github.com:JFrei86/HWserver into web-dev