EA-1 - Move beans from @Autowired to moduleApplicationContext.xml