Improved .gitignore
Refactored interceptor into multiple classes