Fix/organize sql files

**Status:** Work in Progress