Add file includes generations, cleanups
Now generating tidy code, add wrapper, cleanups
Add arrays support