Fixed imports and .gitignore