Refactor Multi Tier Project

Refactor Multi Tier Project