1. FIXED: surjective/1.
2. DEPLOYMENT: Relocated several modules.
3. Various fixes.