split header files in 2 and rename structures for sanity