Made outputs also more modular (closes #23)