Work/android

Refactoring preparing to split for widgets and QtQuick UI