Fix gitignore
Refactoring assets