Reorganise build
Merge pull request #220 from pvlugter/reorganise-build

Reorganise and tidy up build