Better organization of include files