Changed fourvector class to include a threevector class rather than its own coordinates