Early build

Reorganize file placement
Syntax error in SQL

Why?