Changed package structure to be a bit more natural, to me.