make api-call be sane, dry, readable and maintainable.
Move code files to a more sensible arrangement