Updated all files and finished setup file