Moving some tables and directory structure