Reorganized

Grouped interfaces according to function