Finishing-up core modules structure