Move paths to be more Go-idiomatic

Update imports to match folder structure

Fix Travis