updated gitignore
reorganised folders