restructured folder hierarchy.