restructuring proto files