changed file locations and worked on client