changes to organization of sql files and optimizations complete