Code refactoring : move functions to included libs
Code refactoring : move functions to included libs