Change Some functions so I made a new Folder