Merge preparation - changed project location back to its correct location, unified DFs, unified UAs, corrected faulty UAs and configuration