Add structure - extract methods to modules