[restructure]
- was restructing the code somewhat - is my first go project after all