Add extension sql and simplify directory structure