Refactor directory preparation
Merge branch '0.5.8-beta' of github.com:wagnert/TechDivision_ApplicationServer into 0.5.8-beta