commit - refactoring trainee and serverprobe apps