Update semantics info
Update folder structure