.gitignore and restructure