Split out the links collections and moved all links models