[WIP] QS 2.x

Continue..

Move up and fix other stuffs...

Continuing..

Unbreak strings..

Very close..

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>