#2. Small modules refactoring, Spring initializer added