Okay done with the database structure finally (had to talk to someone in the middle of it). Next step is to transfer over a copy of the current database and reposition it inside the new structure.
I've seen some nice attention to detail lately. Some of the things I've reported months to years ago have now been fixed. Me likely. Have you been keeping notes?