Reorganized adapter files