Moved NFR into separate folder