LUN-1373: Restructure code.