Update files hierarchy

Update files hierarchy