Reorganize import php pages. Some small updates and fixes.