Add bootstrap and some restructure