Integrate Spring Security; Refactor context files