restructure project and add more angular code