one folder less. warnings cleanup