Moving ui & angular application back. Restructuring...