Spring context refactor
Merge pull request #17 from Laastine/spring-context-refactor

Spring context refactor