changed folder names to make sense