Refactored tag orders
Refactored into one project