Simplify the client folder