some conflicts in the last merge. The new folder externals may help to organize things. Some files will be moved soon