Structural improvements - Linux Build