Further refactoring and tidy ups to safe_qgis directory layout