Restructrued angular app