Added more structure and angular minified