Move scripts around, add controllers with angular