updated for shorter folder names