Fixed broken imports, modified .gitignore