New directory structure

Added NPS folder, moved old ones