cleaned up some of the file layouts