FSfuelSwitch added, namespace/folder changes