Relocated gateway persistence classes

deleted simple SQL deduplication (old SQL gateway persistence stays for
backwards compatibility)