Re organized folder structure