reorganize files; update nwsl