Modified the configuration of public header folders and cleaned the unneeded folders