restructured folder layout