removed useless export
renamed header files