Add spring IOC. Convert to Maven project. Add unit tests