More stuff ;)
Moved and simplified homebrew package definitions