restructured folder structure