Testing refactor branch
Refactoring code -- Added Angular Stuffs (On branch refactor)