bootstrap: reorganizing directories