- install more headers, use subdir now