Improve paths and naming of tables.