Restructure directories to play well with go1
Update imports