modules structure finalized