Move Basic widget classes to internal packages