fixed core and inc folder #32