Moved the GatewayTracker to another package
Removed some old classes
Added some Db helpers