Further queue speedup
Refactored database indexes
Scripts moved to their own directory