Moved some things around, generalized QML components