order structure

changed order structure and added Polymer