Better file names
Don't use default path on internal functions.
Avoids bugs
Fix recrypt bug