Rename base-control to control (closes #656)

@mishanga @dfilatov @sipayRT could you check whether I miss something?