Moved files to folders and fixed gitignore