Fixed project file names
Changed directory names
Updated .gitignore