changed file structure for client