organization / refactor update

implemented angularjs as well