Moved include files into their own folder