Changed subpackage name from optionfunc -> serverfunc