Got rid of references to client folder