Restructure project for Spring Batch