Added server/client folders