Changed package name for tirex. Separated include header files into groups.