Messages and Types restructured
Final module structure