Added test case for Go version
Moved some files around