[fixes #9] switch to bootstrap, moved stuff around, bit of a wip