license header, stub classes rearrangement