Maven introduction. Refactored and started updating code.