Removed some old materials, added new constructers cleaned project