Fixed module call
Improved error handling
Move PSA seperately.
fixed folder deletion bug
.