Move widget class to includes/