enabling teamcity integration, refactoring dependencies