add wget and change package name
make the build pass, reorganize stuff