Update source base directory

Using ${SETTINGS_DIRECTORY}/src instead of ${SETTINGS_DIRECTORY}/var
Merge branch 'develop'