-- GEP-50, code cleanup and used __DIR__ function to fetch sql files