Added todos script
Change file names