reorganized Claudio code