Refactoring : Moving code in files in dikkilib