Added modules structure