Broke out structures into a module