Fix/organize sql files

**Status:** Done

Any Suggestions?