Finishing fixing of directory paths from initial import.