Added Spock testing and refactored modules into a single module