Updated some folder names for clarity.