Fix targets structure