Some cleanup
Deleted duplicated system folder
fix directories problems