Reformatting of schema creation queries
Renaming files