breaking out all of the sql into separate files
updating flavors to support C,U,D