Refactoring, added godeps