Fixes, updates to all
Cleaning folder