Rearranged and initialized the folders