fixed up some imports, now dependant on my forks, not the original repos

Signed-off-by: Exikle <dixondcunha@hotmail.com>