re arrange include files, removed extra files