File reorganization; Fix FMDB for iOS with newest version of sqlite