move common components in upper folder