restructured code
enabled angular support