refactoring + buildpath OSF