Updated Client files and reorganised repo