Modify gitignore
Modify gitignore and get rid of bad file structure