removed unnecessary models and moved everything to closets model