improve bootstrap, move files