2nd course examples: improving module structure