Clean up BinaryParams script, change package structure