Re-structured root folder