Updated all files and merged to have one main file