Fixing settings.gradle and renaming folder to match project name