added bootstrap and reformatted structure