reorganize Droid Concepts Interface, add headers