Added missing files and removed non needed