Improved order in database schema file
organized imports