Fix Examples in godoc
Refactoreing files