moved all changes to one single file and removed the rest