Add missing and remove unused import
Wrap the main application in a class