add angular to local, file rename and some re-indentation