added bootstrapper, restructured