Fix Organization DB Structure