Add page router. Remove swp files