Merging backend and master, Changed File naming