Reorganize QML

I guess I broke something here. But I fixed typing notifications.