Reorganize ddl scripts