Move widgets in separate files