Add QOS and modify structure/build script accordingly