Changed NULL to nullptr
Changed folder