update path and names
Update folders layout