Minor renaming

renamed several elements to make them more clear and consistent
added gitignore and restored the icon file