moved paths to settings
merged