moved resources, fixed namespace collison between components