Fix folder system structure