Fixing folder and project names