Moved switch to new package