New SQL functions dir structure
Merge branch '2.0'