Tidying up angular structure
html version
KPI collection
Back to Silverlight
reverted to revision 122