Updated module structure (see #2)