Add empty function
Refactoring package structure