give proper folder structur - add tags