More work moving code out of main.sass

Signed-off-by: Jo3M3tal <Joe.Master@att.net>