Change to use MySQL
Allow for revised directory structure