Added extra labelling and GUI folders