mysql module re-organized