restuctured folder structure