Some refactoring. Put things in packages and created a utilities class.
Updated .gitignore