Modified structure. Starting to work on integrating angularjs