Add controls for FK_Prep
Add benchmarking code
Move some database files