Adjusting folder names

Only adjusting folder names - no changes in sources yet.