clean 4.11 & red 4.12

change structure
green 4.12