reorganize
add bootstrap
reset dir names