SGLINE/XLINE are now modules

More code clean up.. putting v2 aside for a few days to write debug
branch