Cleanup

shorter list of includes and changes readme