Refactoring, OCD-Service in Build-Path included