Cleaner way to put files on place

And the icon is finally working!