Final changes

Refactor , so the follders shuld look the same