Split the new widgets up into separate files