Refactored goods and assets

Moved goods to its own class, moved clunky stuff to relationship class