Refactored package import.
Updated .gitignore