restructure client folders