tidy up file with #regions, rename sqlite models to SQLite