Fixed duplicate folder issues
Merge branch 'master' of https://github.com/crystalbyte/paranoia.git