Redid the folder hierarchy