Moved include files into inc dir, debug