Add -JoinOption (uint) parameter and Re-organize the extension items into separate folders