Moved grid & utils to Widgets folder