Reordering of classes, add license header