Refactor file name and links (./)stuffs with folders