refactored entry folder names
modifications for the new folders