Big code restructuring, removed unused classes, extract module domain, Spring 4