Fixed package structure

Apparently, dashes are not permissible in package names. This is now
fixed.