Refactor qml files