Modified gitignore, refactored package structure, added JUnit