Use local module and receive target as param
Refactoring: Moved files into different folders