diff --git a/core/vm/address.go b/core/vm/contracts.go
similarity index 100%
rename from core/vm/address.go
rename to core/vm/contracts.go
diff --git a/core/vm/environment.go b/core/vm/environment.go
index cc9570fc8..282d19578 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -2,13 +2,10 @@ package vm
 
 import (
 	"errors"
-	"fmt"
-	"io"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/rlp"
 )
 
 type Environment interface {
@@ -52,40 +49,3 @@ func Transfer(from, to Account, amount *big.Int) error {
 
 	return nil
 }
-
-type Log struct {
-	address common.Address
-	topics  []common.Hash
-	data    []byte
-	log     uint64
-}
-
-func (self *Log) Address() common.Address {
-	return self.address
-}
-
-func (self *Log) Topics() []common.Hash {
-	return self.topics
-}
-
-func (self *Log) Data() []byte {
-	return self.data
-}
-
-func (self *Log) Number() uint64 {
-	return self.log
-}
-
-func (self *Log) EncodeRLP(w io.Writer) error {
-	return rlp.Encode(w, []interface{}{self.address, self.topics, self.data})
-}
-
-/*
-func (self *Log) RlpData() interface{} {
-	return []interface{}{self.address, common.ByteSliceToInterface(self.topics), self.data}
-}
-*/
-
-func (self *Log) String() string {
-	return fmt.Sprintf("{%x %x %x}", self.address, self.data, self.topics)
-}
diff --git a/core/vm/main_test.go b/core/vm/main_test.go
deleted file mode 100644
index 0ae03bf6a..000000000
--- a/core/vm/main_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package vm
-
-import (
-	"testing"
-
-	checker "gopkg.in/check.v1"
-)
-
-func Test(t *testing.T) { checker.TestingT(t) }
diff --git a/core/vm/types.go b/core/vm/opcodes.go
similarity index 100%
rename from core/vm/types.go
rename to core/vm/opcodes.go
diff --git a/core/vm/vm_test.go b/core/vm/vm_test.go
deleted file mode 100644
index 9bd147a72..000000000
--- a/core/vm/vm_test.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package vm
-
-// Tests have been removed in favour of general tests. If anything implementation specific needs testing, put it here