rm src + inc sub-folders; move files up one; first breaking change