Restructuring directory, adding angular