Moved include files to separate directory