refactored application-context: moved some beans to appropriated project and file