Re organized folder and added condition for shifiting window