v.20 stable

- so many changes applied on the files/folder structures