"src" directory re-org
"src" directory re-org
Revert ""src" directory re-org"

This reverts commit abc9b1ef31a50200c7b413aa7228d712e4a74a56.
Merge branch 'master' of https://github.com/singator/bdah

Conflicts:
	src/workshop4_pre-ws.html
Merge branch 'master' of https://github.com/singator/bdah