Restructured folder layout