Clean up import, add root directory to config file