Restructured folder and made paths flat.