Add configuration and restore original directory structure