Restructured project to fit Angular structure