fix folder name and other integration issues