Fixed a few NS-inconsistencies, moved around some files.