Restructure project, Angular almost working