Refactoring: source file splitted into parts