Little cleanup
Remove bin, use package bin instead
Rename files for max similarity