Relocated the less that are dependent on bootstrap