Structure slightly changed in Spring

Structure slightly changed in Spring