Remove useless function
Reorganize files
Fix pkg path.
Get correctly file name.