Further modularization skeleton