Consolidated includes in corresponding folder