Move headers to inc folder

Move headers to inc folder
misc

misc update