Changed folder structure for neatness