A bit refactored
A more natural ordering in the SQL Structure