Refactored package. Added stuff to gitignore.